diff --git a/styles/elements/_block_lists.scss b/styles/elements/_block_lists.scss
index ade36741..f0549853 100644
--- a/styles/elements/_block_lists.scss
+++ b/styles/elements/_block_lists.scss
@@ -17,7 +17,8 @@
   justify-content: space-between;
 
   .icon-tooltip {
-    padding: 0.25rem 0.5rem;
+    margin: -$gap;
+
   }
 }
 
diff --git a/styles/sections/_project_edit.scss b/styles/sections/_project_edit.scss
index 2222fd26..ef1bc39a 100644
--- a/styles/sections/_project_edit.scss
+++ b/styles/sections/_project_edit.scss
@@ -13,7 +13,7 @@
     @include icon-link-vertical;
     @include icon-link-color($color-red, $color-red-lightest);
 
-    margin-bottom: -$gap;
+    margin-bottom: 0;
     margin-right: -$gap;
   }
 }
diff --git a/templates/workspace_project_new.html b/templates/workspace_project_new.html
index fb24b2b1..874f93d3 100644
--- a/templates/workspace_project_new.html
+++ b/templates/workspace_project_new.html
@@ -41,13 +41,13 @@
         <ul>
           <li v-for="(environment, i) in environments" class="block-list__item project-edit__env-list-item">
             <div class="usa-input">
-              <label :for="'environment_names-' + i">Environment Name</span>
-              <input type="text" :name="'environment_names-' + i" :id="'environment_names-' + i" v-model="environment.name"></input>
+              <label :for="'environment_names-' + i">Environment Name</label>
+              <input type="text" :name="'environment_names-' + i" :id="'environment_names-' + i" v-model="environment.name">
             </div>
-              <button v-on:click="removeEnvironment(i)" v-if="i > 0" type="button" class='project-edit__env-list-item__remover'>
-                <span>{{ Icon('trash') }}</span>
-                <span>Remove</span>
-              </button>
+            <button v-on:click="removeEnvironment(i)" v-if="environments.length > 1" type="button" class='project-edit__env-list-item__remover'>
+              {{ Icon('trash') }}
+              <span>Remove</span>
+            </button>
           </li>
         </ul>