diff --git a/backend/src/routes.ts b/backend/src/routes.ts
index aeda734e1..0bd3aa7cf 100644
--- a/backend/src/routes.ts
+++ b/backend/src/routes.ts
@@ -761,7 +761,19 @@ class Routes {
   public async getBlock(req: Request, res: Response) {
     try {
       const block = await blocks.$getBlock(req.params.hash);
-      res.setHeader('Expires', new Date(Date.now() + 1000 * 600).toUTCString());
+
+      const blockAge = new Date().getTime() / 1000 - block.timestamp;
+      const day = 24 * 3600;
+      let cacheDuration;
+      if (blockAge > 365 * day) {
+        cacheDuration = 30 * day;
+      } else if (blockAge > 30 * day) {
+        cacheDuration = 10 * day;
+      } else {
+        cacheDuration = 600
+      }
+
+      res.setHeader('Expires', new Date(Date.now() + 1000 * cacheDuration).toUTCString());
       res.json(block);
     } catch (e) {
       res.status(500).send(e instanceof Error ? e.message : e);
diff --git a/frontend/src/app/components/graphs/graphs.component.html b/frontend/src/app/components/graphs/graphs.component.html
index 8914adf0a..6f93676f6 100644
--- a/frontend/src/app/components/graphs/graphs.component.html
+++ b/frontend/src/app/components/graphs/graphs.component.html
@@ -1,10 +1,10 @@
 <div *ngIf="stateService.env.MINING_DASHBOARD || stateService.env.LIGHTNING" class="mb-3 d-flex menu"
   style="padding: 0px 35px;">
 
-  <a routerLinkActive="active" class="btn btn-primary w-50 mr-1"
+  <a routerLinkActive="active" class="btn btn-primary mr-1" [class]="padding"
     [routerLink]="['/graphs/mempool' | relativeUrl]">Mempool</a>
 
-  <div ngbDropdown class="w-50" *ngIf="stateService.env.MINING_DASHBOARD">
+  <div ngbDropdown class="mr-1" [class]="padding" *ngIf="stateService.env.MINING_DASHBOARD">
     <button class="btn btn-primary w-100" id="dropdownBasic1" ngbDropdownToggle i18n="mining">Mining</button>
     <div ngbDropdownMenu aria-labelledby="dropdownBasic1">
       <a class="dropdown-item" routerLinkActive="active" [routerLink]="['/graphs/mining/pools' | relativeUrl]"
@@ -27,7 +27,7 @@
     </div>
   </div>
 
-  <div ngbDropdown class="w-50" *ngIf="stateService.env.LIGHTNING">
+  <div ngbDropdown [class]="padding" *ngIf="stateService.env.LIGHTNING">
     <button class="btn btn-primary w-100" id="dropdownBasic1" ngbDropdownToggle i18n="lightning">Lightning</button>
     <div ngbDropdownMenu aria-labelledby="dropdownBasic1">
       <a class="dropdown-item" routerLinkActive="active" [routerLink]="['/graphs/lightning/nodes-networks' | relativeUrl]"
diff --git a/frontend/src/app/components/graphs/graphs.component.ts b/frontend/src/app/components/graphs/graphs.component.ts
index e172d2206..1d3a4e2ae 100644
--- a/frontend/src/app/components/graphs/graphs.component.ts
+++ b/frontend/src/app/components/graphs/graphs.component.ts
@@ -8,6 +8,8 @@ import { WebsocketService } from "src/app/services/websocket.service";
   styleUrls: ['./graphs.component.scss'],
 })
 export class GraphsComponent implements OnInit {
+  padding = 'w-50';
+
   constructor(
     public stateService: StateService,
     private websocketService: WebsocketService
@@ -15,5 +17,9 @@ export class GraphsComponent implements OnInit {
 
   ngOnInit(): void {
     this.websocketService.want(['blocks']);
+
+    if (this.stateService.env.MINING_DASHBOARD === true && this.stateService.env.LIGHTNING === true) {
+      this.padding = 'w-33';
+    }
   }
 }