diff --git a/templates/main/settings_machine_tabs_body.html.ep b/templates/main/settings_machine_tabs_body.html.ep
index 8383b448e..1a5d0f7b5 100644
--- a/templates/main/settings_machine_tabs_body.html.ep
+++ b/templates/main/settings_machine_tabs_body.html.ep
@@ -23,8 +23,8 @@
         %= include 'main/vm_options'
     </div>
 % }
-% if ($USER->can_change_settings($domain->id) && !$domain->is_base ) {
-    <div class="tab-pane fade" id="v-pills-screenshot" role="tabpanel" aria-labelledby="v-pills-screenshot-tab">
+% if ($USER->can_change_settings($domain->id)) {
+    <div class="tab-pane fade" id="v-pills-screenshot" role="tabpanel" aria-labelledby="v-pills-screenshot-tab" ng-hide="showmachine.is_base">
         %= include 'main/vm_screenshot'
     </div>
 % }
@@ -33,8 +33,8 @@
         %= include 'main/vm_hardware'
     </div>
 % }
-% if ($USER->can_change_settings($domain->id) && !$domain->is_base) {
-    <div class="tab-pane fade <%= $show_actions %>" id="v-pills-actions" role="tabpanel" aria-labelledby="v-pills-actions-tab" >
+% if ($USER->can_change_settings($domain->id)) {
+    <div class="tab-pane fade <%= $show_actions %>" id="v-pills-actions" role="tabpanel" aria-labelledby="v-pills-actions-tab" ng-hide="showmachine.is_base">
         %= include 'main/vm_actions'
     </div>
 % }
@@ -42,7 +42,7 @@
         %= include 'main/vm_copy'
     </div>
 % if ( $USER->is_admin) {
-    <div class="tab-pane fade" id="v-pills-clones" >
+    <div class="tab-pane fade" id="v-pills-clones" ng-show="showmachine.has_clones && showmachine.is_base">
         %= include 'main/vm_clones'
     </div>
 % }
@@ -61,8 +61,8 @@
         %= include 'main/vm_remove'
     </div>
 % }
-% if ( $monitoring && $USER->is_admin && $domain->is_active && $domain->internal_id) {
-    <div class="tab-pane fade" id="v-pills-monitoring" role="tabpanel" aria-labelledby="v-pills-monitoring-tab">
+% if ( $monitoring && $USER->is_admin && $domain->internal_id) {
+    <div class="tab-pane fade" id="v-pills-monitoring" role="tabpanel" aria-labelledby="v-pills-monitoring-tab" ng-show="showmachine.is_active">
         %= include 'main/vm_monitoring'
     </div>
 % }
diff --git a/templates/main/settings_machine_tabs_head.html.ep b/templates/main/settings_machine_tabs_head.html.ep
index 47ec1d683..e5e40f12a 100644
--- a/templates/main/settings_machine_tabs_head.html.ep
+++ b/templates/main/settings_machine_tabs_head.html.ep
@@ -1,6 +1,6 @@
     <div class="nav flex-column nav-pills bg-light" id="v-pills-tab" role="tablist" aria-orientation="vertical">
-    %   if (($USER->can_change_settings($domain->id)) && !$domain->is_base) {
-        <a class="nav-link <%= $active_actions %>" id="v-pills-actions-tab" href="#v-pills-actions" data-toggle="pill" role="tab" aria-controls="v-pills-actions" aria-selected="true" ng-disabled="edit"><%=l 'Actions' %></a>
+    %   if (($USER->can_change_settings($domain->id))) {
+        <a class="nav-link <%= $active_actions %>" id="v-pills-actions-tab" ng-if="showmachine && !showmachine.is_base" href="#v-pills-actions" data-toggle="pill" role="tab" aria-controls="v-pills-actions" aria-selected="<%= $active_actions ? 'true' : 'false' %>" ng-disabled="edit"><%=l 'Actions' %></a>
     %   }
     %   if ($USER->can_change_settings($domain->id)) {
         <a class="nav-link <%= $active_description %>" id="v-pills-description-tab" href="#v-pills-description" data-toggle="pill" role="tab" aria-controls="v-pills-description" aria-selected="false"><%=l 'Description' %></a>
@@ -14,8 +14,8 @@
     %	if ($USER->can_change_settings($domain->id) || $USER->can_create_disk || $USER->is_admin){
         <a class="nav-link" id="v-pills-hardware-tab" href="#v-pills-hardware" data-toggle="pill" role="tab" aria-controls="v-pills-hardware" aria-selected="false"><%=l 'Hardware' %></a>
     %	}
-    %   if ($USER->can_change_settings($domain->id) && !$domain->is_base) {
-        <a class="nav-link" id="v-pills-screenshot-tab" href="#v-pills-screenshot" data-toggle="pill" role="tab" aria-controls="v-pills-screenshot" aria-selected="false"><%=l 'Screenshot' %></a>
+    %   if ($USER->can_change_settings($domain->id)) {
+        <a class="nav-link" id="v-pills-screenshot-tab" ng-if="showmachine && !showmachine.is_base" href="#v-pills-screenshot" data-toggle="pill" role="tab" aria-controls="v-pills-screenshot" aria-selected="false"><%=l 'Screenshot' %></a>
     %   }
     %   if ($USER->is_admin && !$domain->is_volatile) {
         <a class="nav-link" id="v-pills-base-tab" href="#v-pills-base" data-toggle="pill" role="tab" aria-controls="v-pills-base" aria-selected="false"><%=l 'Base' %></a>
@@ -32,8 +32,8 @@
     %   if ( $USER->can_remove_machine($domain->id)) {
         <a class="nav-link remove" id="v-pills-remove-tab" href="#v-pills-remove" data-toggle="pill" role="tab" aria-controls="v-pills-remove" aria-selected="false"><%=l 'Remove' %></a>
     %   }
-    %   if ($USER->is_admin && $domain->is_base){
-        <a class="nav-link" id="v-pills-clones-tab" ng-show="showmachine.has_clones" href="#v-pills-clones" data-toggle="pill" role="tab" aria-controls="v-pills-clones" aria-selected="false"><%=l 'Clones' %></a>
+    %   if ($USER->is_admin()){
+        <a class="nav-link" id="v-pills-clones-tab" ng-if="showmachine.has_clones && showmachine.is_base" href="#v-pills-clones" data-toggle="pill" role="tab" aria-controls="v-pills-clones" aria-selected="false"><%=l 'Clones' %></a>
 %   }
     %   if ($USER->is_admin){
         <a class="nav-link" id="v-pills-pool-tab" href="#v-pills-pool" data-toggle="pill" role="tab" aria-controls="v-pills-pool" aria-selected="false"
@@ -43,8 +43,8 @@
         <a class="nav-link" id="v-pills-hostdev-tab" href="#v-pills-hostdev" data-toggle="pill" role="tab" aria-controls="v-pills-hostdev" aria-selected="false"
         ><%=l 'Host Devices' %></a>
 %   }
-    % if ( $monitoring && $USER->is_admin && $domain->is_active ) {
-        <a class="nav-link" id="v-pills-monitoring-tab" href="#v-pills-monitoring" data-toggle="pill" role="tab" aria-controls="v-pills-monitoring" aria-selected="false"><%=l 'System overview' %></a>
+    % if ( $monitoring && $USER->is_admin()) {
+        <a class="nav-link" id="v-pills-monitoring-tab" ng-if="showmachine && showmachine.is_active" href="#v-pills-monitoring" data-toggle="pill" role="tab" aria-controls="v-pills-monitoring" aria-selected="false"><%=l 'System overview' %></a>
     %   }
 
         <a class="nav-link" id="v-pills-share-tab" ng-click="refresh_machine()" href="#v-pills-share" data-toggle="pill" role="tab" aria-controls="v-pills-share" aria-selected="false"><%=l 'Share' %></a>