diff --git a/src/components/App.jsx b/src/components/App.jsx
index 7cce8783..c1da61c4 100644
--- a/src/components/App.jsx
+++ b/src/components/App.jsx
@@ -166,7 +166,7 @@ export default class App extends React.Component {
       selectedLayerIndex: 0,
       sources: {},
       vectorLayers: {},
-      mapState: "normal",
+      mapState: "map",
       spec: styleSpec.latest,
       isOpen: {
         settings: false,
diff --git a/src/components/Toolbar.jsx b/src/components/Toolbar.jsx
index 0103bf88..c0a21905 100644
--- a/src/components/Toolbar.jsx
+++ b/src/components/Toolbar.jsx
@@ -131,26 +131,30 @@ export default class Toolbar extends React.Component {
       },
       {
         id: "filter-deuteranopia",
-        title: "Filter deuteranopia",
+        title: "Map (deuteranopia)",
         icon: <ColorIcon/>,
       },
       {
         id: "filter-protanopia",
-        title: "Filter protanopia",
+        title: "Map (protanopia)",
         icon: <ColorIcon/>,
       },
       {
         id: "filter-tritanopia",
-        title: "Filter tritanopia",
+        title: "Map (tritanopia)",
         icon: <ColorIcon/>,
       },
       {
         id: "filter-achromatopsia",
-        title: "Filter achromatopsia",
+        title: "Map (achromatopsia)",
         icon: <ColorIcon/>,
       },
     ];
 
+    const currentView = views.find((view) => {
+      return view.id === this.props.mapState;
+    });
+
     return <div className='maputnik-toolbar'>
       <div className="maputnik-toolbar__inner">
         <div
@@ -195,7 +199,7 @@ export default class Toolbar extends React.Component {
           >
             <Button wdKey="nav:settings" className="maputnik-toolbar-action">
               <ViewIcon/>
-              <IconText>Change view</IconText>
+              <IconText>View: {currentView.title}</IconText>
             </Button>
             <Menu>
               <ul className="map-state-menu__menu">