diff --git a/web/src/css/aggregator.css b/web/src/css/aggregator.css
index 6d1a0b6..c27eae9 100644
--- a/web/src/css/aggregator.css
+++ b/web/src/css/aggregator.css
@@ -20,18 +20,15 @@
 /* City Analysis follows the same rail + full-width workspace geometry as Faktiskā. */
 .aggregator>.cityWorkspace{
     grid-template-columns:230px minmax(0,1fr);
-    grid-template-areas:"cities query" "cities results";
     column-gap:28px;
-    row-gap:16px;
 }
 .aggregator .workspaceRail{
-    grid-area:cities;
     padding:4px 24px 10px 0;
     border-right:1px solid rgba(90,126,166,.2);
 }
 .aggregator .workspaceRail h2{margin:0 0 18px;font-size:16px}
+.aggregator .analysisMain{display:grid;gap:16px;min-width:0;align-content:start}
 .aggregator .workspaceToolbar{
-    grid-area:query;
     display:grid;
     grid-template-columns:210px minmax(300px,1.25fr) minmax(500px,2fr);
     gap:24px;
@@ -50,18 +47,16 @@
 .aggregator .queryPanel h4{margin:0 0 9px}
 .aggregator .queryPanel p{margin:8px 0 0}
 .aggregator .queryOptions ul{margin:0;padding:0}
-.aggregator .resultsPanel{grid-area:results;grid-column:2;min-width:0;width:100%}
+.aggregator .resultsPanel{min-width:0;width:100%}
 .aggregator .resultsPanel>div{width:100%}
 
 @media(max-width:1200px){
-    .aggregator>.cityWorkspace{grid-template-columns:210px minmax(0,1fr);grid-template-areas:"cities query" "cities results"}
+    .aggregator>.cityWorkspace{grid-template-columns:210px minmax(0,1fr)}
     .aggregator .workspaceToolbar{grid-template-columns:1fr;align-items:start}
     .aggregator .queryOptions{grid-column:auto}
-    .aggregator .resultsPanel{grid-column:2}
 }
 @media(max-width:800px){
-    .aggregator>.cityWorkspace{grid-template-columns:1fr;grid-template-areas:"cities" "query" "results"}
+    .aggregator>.cityWorkspace{grid-template-columns:1fr}
     .aggregator .workspaceRail{padding-right:0;border-right:0;border-bottom:1px solid rgba(90,126,166,.2)}
     .aggregator .queryOptions{grid-template-columns:1fr}
-    .aggregator .resultsPanel{grid-column:1}
 }
diff --git a/web/src/pages/cities/Cities.tsx b/web/src/pages/cities/Cities.tsx
index 9162fec..7ecece8 100644
--- a/web/src/pages/cities/Cities.tsx
+++ b/web/src/pages/cities/Cities.tsx
@@ -28,34 +28,36 @@ export function Cities() {
                     <h2>1. Choose cities</h2>
                     <SelectCity getCities={getCities} setCities={setCities} />
                 </aside>
-                <aside class="queryPanel workspaceToolbar">
-                    <h2>2. Configure query</h2>
-                    <div class="queryTimeRange">
-                        <SelectTimeRange
-                            getStart={getStart}
-                            setStart={setStart}
-                            getEnd={getEnd}
-                            setEnd={setEnd}
-                        />
-                    </div>
-                    <div class="queryOptions">
-                        <div class="queryField">
-                            <h4>Select field</h4>
-                            <SelectField getField={getField} setField={setField} />
+                <section class="analysisMain">
+                    <aside class="queryPanel workspaceToolbar">
+                        <h2>2. Configure query</h2>
+                        <div class="queryTimeRange">
+                            <SelectTimeRange
+                                getStart={getStart}
+                                setStart={setStart}
+                                getEnd={getEnd}
+                                setEnd={setEnd}
+                            />
                         </div>
-                        <SelectKey getKey={getKey} setKey={setKey} />
-                        <SelectGranularity getGranularity={getGranularity} setGranularity={setGranularity} />
-                    </div>
-                </aside>
-                <section class="resultsPanel">
-                    <QueryView
-                        getCities={getCities}
-                        getStart={getStart}
-                        getEnd={getEnd}
-                        getField={getField}
-                        getKey={getKey}
-                        getGranularity={getGranularity}
-                    />
+                        <div class="queryOptions">
+                            <div class="queryField">
+                                <h4>Select field</h4>
+                                <SelectField getField={getField} setField={setField} />
+                            </div>
+                            <SelectKey getKey={getKey} setKey={setKey} />
+                            <SelectGranularity getGranularity={getGranularity} setGranularity={setGranularity} />
+                        </div>
+                    </aside>
+                    <section class="resultsPanel">
+                        <QueryView
+                            getCities={getCities}
+                            getStart={getStart}
+                            getEnd={getEnd}
+                            getField={getField}
+                            getKey={getKey}
+                            getGranularity={getGranularity}
+                        />
+                    </section>
                 </section>
             </div>
         </div>