diff --git a/core/style.css b/core/style.css
index d3c2e88..406e286 100644
--- a/core/style.css
+++ b/core/style.css
@@ -679,14 +679,14 @@ nav.top .navbutton-bar .button.selected {
 
 /* == HEADING/HEADER */
 
-.header {
+body > .header {
 	display: flex;
 	margin-bottom: 8px;
 }
 
-.header > .gap { flex-grow: 1;}
+body > .header > .gap { flex-grow: 1;}
 
-.header > .title {
+body > .header > .title {
 	border: var(--primary-container-border);
 	border-top: none;
 	flex-shrink: 0; flex-grow: 0;
@@ -703,7 +703,7 @@ nav.top .navbutton-bar .button.selected {
 	padding-top: 8px;
 }
 
-.heading {
+body > .heading {
 	z-index: 10;
 	display: block;
 	background-repeat: repeat-x;
@@ -714,46 +714,29 @@ nav.top .navbutton-bar .button.selected {
 	font-family: var(--primary-font);
 }
 
-.heading > div.head-contents {
+body > .heading > div.head-contents {
 	max-width: 1200px;
 	margin-left: auto; margin-right: auto;
 
 }
 
-.heading.main {
+body > .heading.main {
 	position: sticky;
 	background-size: 64px;
 	height: 60px;
 	z-index: -1;
 }
 
-.heading {
+body > .heading {
 	background-color: var(--header-bg);
 	background-image: var(--navbar-top);
 }
 
-.heading.sub,
-.heading.section {
-	height: 28px;
-}
-
-.heading.sub {
-	background-size: 64px;
-	background-position-y: -32px;
-}
-
-.heading.section {
-	background-size: 32px;
-	background-image: var(--nav-db);
-	background-color: var(--header-bg);
-	font-size: 1.5em;
-}
-
-.heading.main > div.head-contents > a {
+body > .heading.main > div.head-contents > a {
 	font-size: 2em;
 }
 
-.heading > div.head-contents > a {
+body > .heading > div.head-contents > a {
 	margin: 0px 0px 0px 4px;
 	display: inline-block;
 	font-weight: bold;
@@ -765,17 +748,17 @@ nav.top .navbutton-bar .button.selected {
 	display: inline-block;
 }
 
-.heading.main img {
+body > .heading.main img {
 	height: 48px;
 }
 
-.heading.main i {
+body > .heading.main i {
 	margin-left: 16px;
 	font-weight: normal;
 	font-size: 1.5em !important;
 }
 
-.heading hr {
+body > .heading hr {
 	margin: 0px 8px;
 	border: none;
 	border-left: var(--header-line);
@@ -784,7 +767,7 @@ nav.top .navbutton-bar .button.selected {
 	height: 75%;
 }
 
-.header div.buttontab {
+body > .header div.buttontab {
 	background: var(--default-button-background);
 	border: var(--default-button-border);
 	margin: -12px 4px 8px 4px;
@@ -792,7 +775,7 @@ nav.top .navbutton-bar .button.selected {
 	font-size: 12px;
 }
 
-.header div.buttontab a {
+body > .header div.buttontab a {
 	color: var(--main-text);
 	display: inline-block;
 	text-decoration: none;
@@ -800,40 +783,28 @@ nav.top .navbutton-bar .button.selected {
 	height: 100%;
 }
 
-.header div.buttontab a img {
+body > .header div.buttontab a img {
 	vertical-align: middle;
 }
 
-.header div.buttontab:hover {
+body > .header div.buttontab:hover {
 	background: var(--hover-button-background);
 	border: var(--hover-button-border);
 }
 
-.header div.buttontab:active {
+body > .header div.buttontab:active {
 	background: var(--active-button-background);
 	border: var(--active-button-border);
 }
 
 @media only screen and (orientation: landscape) {
-	.heading {
+	body > .heading {
 		width: calc(100% + 8px);
 		padding: 2px 4px;
 		left: 64px;
 	}
 
-	.heading.main,
-	.heading.sub {
-		top: 0px;
-	}
-
-	.heading.main { margin: -8px; margin-bottom: 8px; }
-	.heading.sub { margin: -8px; margin-bottom: 8px; }
-	.heading.section { margin: 4px -8px; }
-
-	body > .header-title {
-		top: -8px;
-		margin-bottom: -8px;
-	}
+	body > .heading.main { top: 0px; margin: -8px; margin-bottom: 8px; }
 
 	/* Center header */
 	body > .header {