diff --git a/src/App.vue b/src/App.vue
index a84aec7f1ace93de9ef2a775992f0f47bf2b5999..2c345237343c825770107840368be50c8bb9e84e 100644
--- a/src/App.vue
+++ b/src/App.vue
@@ -132,8 +132,8 @@
       </div>
     </header>
     <main>
-      <div id="messages" class="ui stackable grid centered container">
-        <div v-if="messages" class="row">
+      <div id="content" class="ui stackable grid centered container">
+        <div v-if="messages && messages.length > 0" class="row">
           <div class="fourteen wide column">
             <div
               v-for="(message, index) in messages"
diff --git a/src/store/index.js b/src/store/index.js
index 42f245251c46b413c6b305d07fdf62ed1e6da0b4..713cf40a33323737061d331985840c6e09a39361 100644
--- a/src/store/index.js
+++ b/src/store/index.js
@@ -92,7 +92,7 @@ export default new Vuex.Store({
     },
     DISPLAY_MESSAGE(state, comment) {
       state.messages = [{ comment }, ...state.messages];
-      document.getElementById("messages").scrollIntoView({ block: "start", inline: "nearest" });
+      document.getElementById("content").scrollIntoView({ block: "start", inline: "nearest" });
     },
     CLEAR_MESSAGES(state) {
       state.messages = [];
diff --git a/src/views/project/Project_mapping.vue b/src/views/project/Project_mapping.vue
index fb34bc264794a3096c4aa2ed2018489024b1eac0..976ea82b8e7dae7fc63dfb9625817e5b9e886a73 100644
--- a/src/views/project/Project_mapping.vue
+++ b/src/views/project/Project_mapping.vue
@@ -102,7 +102,8 @@ export default {
           .dispatch("map/SAVE_BASEMAPS", this.newBasemapIds)
           .then((response) => {
             const errors = response.filter(
-              (res) => res.status !== 200 && res.status !== 204
+              (res) =>
+                res.status === 200 && res.status === 201 && res.status === 204
             );
             if (errors.length === 0) {
               this.infoMessage.push({