diff --git a/openslides/agenda/static/templates/agenda/item-list.html b/openslides/agenda/static/templates/agenda/item-list.html
index 28df6571b..438379eae 100644
--- a/openslides/agenda/static/templates/agenda/item-list.html
+++ b/openslides/agenda/static/templates/agenda/item-list.html
@@ -301,7 +301,7 @@
                 <i class="fa fa-clock-o"></i>
                 <span editable-text="item.durationText" e-placeholder="hh:mm"
                   onshow="generateDurationText(item)" onaftersave="setDurationText(item)">
-                  <span ng-if="!item.duration" translate>Set duration...</span>
+                  <span ng-if="!item.duration" translate>Set duration ...</span>
                   <span ng-if="item.duration">
                     {{ (item.duration | osMinutesToTime)}}
                     <translate translate-comment="'h' means time in hours">h</translate>
@@ -318,7 +318,7 @@
               <div class="popover-wrapper" os-perms="agenda.can_manage">
                 <i class="fa fa-info-circle"></i>
                 <span editable-text="item.comment" onaftersave="save(item)">
-                  <span ng-if="!item.comment" translate>Set comment...</span>
+                  <span ng-if="!item.comment" translate>Set comment ...</span>
                   <span ng-if="item.comment">{{ item.comment }}</span>
                 </span>
               </div>
diff --git a/openslides/core/static/css/app.css b/openslides/core/static/css/app.css
index 5769012e0..acb7e3a8d 100644
--- a/openslides/core/static/css/app.css
+++ b/openslides/core/static/css/app.css
@@ -417,11 +417,11 @@ img {
     left: 50%;
     height: 75px;
     width: 300px;
-    background: rgba(242, 222, 222, 0.9);
+    background: #d3d3d3;
     color: black;
     text-align: center;
     padding: 5px;
-    z-index: 10;
+    z-index: 10000;
     display: none;
     border: 1px solid #d3d3d3;
     margin-left: -150px;
diff --git a/openslides/core/static/templates/csv-import.html b/openslides/core/static/templates/csv-import.html
index 2bb0f1747..7bfe5d026 100644
--- a/openslides/core/static/templates/csv-import.html
+++ b/openslides/core/static/templates/csv-import.html
@@ -4,7 +4,8 @@
     <div class="form-control">
       <label for="csvFileSelector">
         <i class="fa fa-upload"></i>
-        {{ selectedFile || ('Select a file' | translate) }}
+        <span ng-if="selectedFile">{{ selectedFile }}</span>
+        <span ng-if="!selectedFile" translate>Select a file</span>
       </label>
       <a href class="pull-right clear-file" ng-if="selectedFile" ng-click="clearFile()">
         <i class="fa fa-times" title="{{ 'Deselect file' | translate }}"></i>
@@ -12,7 +13,8 @@
     </div>
     <input id="csvFileSelector" type="file" value="" accept="{{ accept }}">
     <p class="help-block">
-      <translate translate-context="special filetypes in a file open dialog">Accept</translate>: {{ accept }}
+      <translate translate-context="special filetypes in a file open dialog">Accepted file types</translate>:
+      {{ accept }}
     </p>
   </div>
 
@@ -24,7 +26,10 @@
   <div class="form-group">
     <label for="inputDelimiter" translate>Separator</label>
     <input type="text" class="form-control" ng-model="delimiter" ng-change="parse()" id="inputDelimiter">
-    <p class="help-block help-block-big" ng-if="autodelimiter"><translate>Autodetect</translate>:&nbsp;&nbsp;{{ autodelimiter }}</p>
+    <p class="help-block help-block-big" ng-if="autodelimiter">
+      <translate>Autodetection</translate>:
+      {{ autodelimiter }}
+    </p>
     <p class="help-block" ng-if="!autodelimiter" translate>Leave empty for autodetection of the separator.</p>
   </div>
 </form>
diff --git a/openslides/motions/static/templates/motions/motion-detail/comments.html b/openslides/motions/static/templates/motions/motion-detail/comments.html
index 43ee35f1d..0977e25a0 100644
--- a/openslides/motions/static/templates/motions/motion-detail/comments.html
+++ b/openslides/motions/static/templates/motions/motion-detail/comments.html
@@ -31,12 +31,11 @@
       </div>
       <!-- save toolbar -->
       <div class="motion-save-toolbar" ng-class="{ 'visible': commentsInlineEditing.saveToolbarVisible() }">
-        <div class="changed-hint" ng-if="commentsFields.length > 1" translate>The comments have been changed.</div>
-        <div class="changed-hint" ng-if="commentsFields.length == 1" translate>The comment has been changed.</div>
+        <div class="changed-hint" translate>A comment has been changed.</div>
         <button type="button" ng-click="commentsInlineEditing.save()" class="btn btn-primary" translate>
             Save
         </button>
-        <button type="button" ng-click="commentsInlineEditing.revert()" class="btn btn-primary" translate>
+        <button type="button" ng-click="commentsInlineEditing.revert()" class="btn btn-default" translate>
             Revert
         </button>
       </div>
diff --git a/openslides/motions/static/templates/motions/motion-detail/view-original.html b/openslides/motions/static/templates/motions/motion-detail/view-original.html
index 07c8001ac..0143ff70d 100644
--- a/openslides/motions/static/templates/motions/motion-detail/view-original.html
+++ b/openslides/motions/static/templates/motions/motion-detail/view-original.html
@@ -9,7 +9,7 @@
         <button type="button" ng-click="inlineEditing.save()" class="btn btn-primary" translate>
             Save
         </button>
-        <button type="button" ng-click="inlineEditing.revert()" class="btn btn-primary" translate>
+        <button type="button" ng-click="inlineEditing.revert()" class="btn btn-default" translate>
             Revert
         </button>
         <label ng-if="motion.state.versioning && config('motions_allow_disable_versioning')">
diff --git a/openslides/users/static/templates/users/user-import.html b/openslides/users/static/templates/users/user-import.html
index eb2929bd8..61ad1c841 100644
--- a/openslides/users/static/templates/users/user-import.html
+++ b/openslides/users/static/templates/users/user-import.html
@@ -65,7 +65,7 @@
       <li><a id="downloadLink" href="" ng-click="downloadCSVExample()" translate>Download CSV example file</a>
   </ul>
 
-  <div ng-show="users.length"
+  <div ng-show="users.length">
     <h3 translate>Preview</h3>
     <div class="scroll-x-container">
       <table class="table table-striped table-bordered table-condensed">
diff --git a/openslides/users/static/templates/users/user-list.html b/openslides/users/static/templates/users/user-list.html
index 2ef2ca853..eccb313b7 100644
--- a/openslides/users/static/templates/users/user-list.html
+++ b/openslides/users/static/templates/users/user-list.html
@@ -71,9 +71,9 @@
         <option value="addGroup" translate>Add group</option>
         <option value="removeGroup" translate>Remove group</option>
         <option value="generatePasswords" translate>Generate new passwords</option>
-        <option value="is_active" translate>Set/Unset is active</option>
-        <option value="is_present" translate>Set/Unset is present</option>
-        <option value="is_committee" translate>Set/Unset is a committee</option>
+        <option value="is_active" translate>Set/Unset 'is active'</option>
+        <option value="is_present" translate>Set/Unset 'is present'</option>
+        <option value="is_committee" translate>Set/Unset 'is a committee'</option>
       </select>
       <!-- delete button -->
       <a ng-show="selectedAction == 'delete'"
@@ -110,16 +110,16 @@
       <!-- set bool property button -->
       <a ng-show="inArray(['is_active', 'is_present', 'is_committee'], selectedAction)"
         ng-click="setBoolPropertyMultiple(selectedAction, true)" class="btn btn-default">
-        <span ng-if="selectedAction == 'is_active'" translate>Set active</span>
-        <span ng-if="selectedAction == 'is_present'" translate>Set present</span>
-        <span ng-if="selectedAction == 'is_committee'" translate>Set committee</span>
+        <span ng-if="selectedAction == 'is_active'" translate>Is active</span>
+        <span ng-if="selectedAction == 'is_present'" translate>Is present</span>
+        <span ng-if="selectedAction == 'is_committee'" translate>Is committee</span>
       </a>
       <!-- unset bool property button -->
       <a ng-show="inArray(['is_active', 'is_present', 'is_committee'], selectedAction)"
         ng-click="setBoolPropertyMultiple(selectedAction, false)" class="btn btn-default">
-        <span ng-if="selectedAction == 'is_active'" translate>Unset active</span>
-        <span ng-if="selectedAction == 'is_present'" translate>Unset present</span>
-        <span ng-if="selectedAction == 'is_committee'" translate>Unset committee</span>
+        <span ng-if="selectedAction == 'is_active'" translate>Is not active</span>
+        <span ng-if="selectedAction == 'is_present'" translate>Is not present</span>
+        <span ng-if="selectedAction == 'is_committee'" translate>Is not a committee</span>
       </a>
     </div>
   </div>
@@ -372,7 +372,8 @@
               <div class="popover-wrapper" uib-tooltip="{{ 'Structure level' | translate }}" tooltip-placement="top-left">
                 <i class="fa fa-flag"></i>
                 <span editable-text="user.structure_level" onaftersave="save(user)">
-                  {{ user.structure_level || ('Set structure level...' | translate)}}
+                  <span ng-if="!user.structure_level" translate>Set structure level ...</span>
+                  <span ng-if="user.structure_level">{{ user.structure_level }}</span>
                 </span>
               </div>
             </div>
@@ -387,7 +388,8 @@
               <div class="popover-wrapper" uib-tooltip="{{ 'Comment' | translate }}" tooltip-placement="top-left">
                 <i class="fa fa-info-circle"></i>
                 <span editable-text="user.comment" onaftersave="save(user)">
-                  {{ user.comment || ('Set comment...' | translate)}}
+                  <span ng-if="!user.comment" translate>Set comment ...</span>
+                  <span ng-if="user.comment">{{ user.comment }}</span>
                 </span>
               </div>
             </div>