diff --git a/app/src/frontend/building-edit.js b/app/src/frontend/building-edit.js
index 36cb6527..608c64f9 100644
--- a/app/src/frontend/building-edit.js
+++ b/app/src/frontend/building-edit.js
@@ -170,7 +170,7 @@ class EditForm extends Component {
         const building_like = this.props.building_like;
         return (
             <section className={(this.props.inactive)? "data-section inactive": "data-section"}>
-                <header className={(match? "active " : "") + " section-header edit"}>
+                <header className={`section-header edit ${this.props.slug} ${(match? "active" : "")}`}>
                     <NavLink
                         to={`/edit/${this.props.slug}/building/${this.props.building_id}.html`}
                         title={(this.props.inactive)? 'Coming soon… Click the ? for more info.' :
diff --git a/app/src/frontend/building-view.js b/app/src/frontend/building-view.js
index 5a3e03c4..62c77210 100644
--- a/app/src/frontend/building-view.js
+++ b/app/src/frontend/building-view.js
@@ -75,7 +75,7 @@ const DataSection = (props) => {
     const match = props.cat === props.slug;
     return (
         <section id={props.slug} className={(props.inactive)? "data-section inactive": "data-section"}>
-            <header className={(match? "active " : "") + " section-header view"}>
+            <header className={`section-header view ${props.slug} ${(match? "active" : "")}`}>
                 <NavLink
                     to={`/view/${props.slug}/building/${props.building_id}.html`}
                     title={(props.inactive)? 'Coming soon… Click the ? for more info.' :
diff --git a/app/src/frontend/overview.js b/app/src/frontend/overview.js
index 066dbb82..b591fe57 100644
--- a/app/src/frontend/overview.js
+++ b/app/src/frontend/overview.js
@@ -35,7 +35,7 @@ const OverviewSection = (props) => {
     const inactive = props.inactive;
     return (
         <section className={(inactive? "inactive ": "") + "data-section legend"}>
-            <header className={(match? "active " : "") + " section-header view"}>
+            <header className={`section-header ${props.mode} ${props.slug} ${(match? "active" : "")}`}>
                 <NavLink
                     to={`/${props.mode}/${props.slug}.html`}
                     isActive={() => match}