diff --git a/hosting/locale/de/LC_MESSAGES/django.po b/hosting/locale/de/LC_MESSAGES/django.po
index 95963e34..7476b255 100644
--- a/hosting/locale/de/LC_MESSAGES/django.po
+++ b/hosting/locale/de/LC_MESSAGES/django.po
@@ -407,15 +407,11 @@ msgstr "Public SSH Key"
 msgid "Download"
 msgstr ""
 
-#, fuzzy
-#| msgid "Virtual Machines"
 msgid "Your Virtual Machine Detail"
 msgstr "Virtuelle Maschinen Detail"
 
-#, fuzzy
-#| msgid "Settings"
 msgid "VM Settings"
-msgstr "Einstellungen"
+msgstr "VM Einstellungen"
 
 msgid "Copied"
 msgstr "Kopiert"
@@ -426,25 +422,17 @@ msgstr "Festplatte"
 msgid "Billing"
 msgstr "Abrechnungen"
 
-#, fuzzy
-#| msgid "Current pricing"
 msgid "Current Pricing"
 msgstr "Aktueller Preis"
 
-#, fuzzy
-#| msgid "CHF/Month"
 msgid "Month"
-msgstr "CHF/Monat"
+msgstr "Monat"
 
-#, fuzzy
-#| msgid "Invoice"
 msgid "See Invoice"
 msgstr "Rechnung"
 
-#, fuzzy
-#| msgid "Your SSH Keys"
 msgid "Your VM is"
-msgstr "Deine SSH Keys"
+msgstr "Deine VM ist"
 
 msgid "Pending"
 msgstr "In Vorbereitung"
diff --git a/hosting/templates/hosting/virtual_machine_detail.html b/hosting/templates/hosting/virtual_machine_detail.html
index dafb683a..ad8c3ae4 100644
--- a/hosting/templates/hosting/virtual_machine_detail.html
+++ b/hosting/templates/hosting/virtual_machine_detail.html
@@ -11,7 +11,7 @@
 	    </div>
 	{% endif %}
 	<div class="virtual-machine-container dashboard-container">
-        <h1 class="dashboard-title-thin">{% trans "Your Virtual Machine Detail" %}</h1>
+    <h1 class="dashboard-title-thin">{% trans "Your Virtual Machine Detail" %}</h1>
 		<div class="vm-detail-contain">
 			<div class="vm-detail-item">
 				<h2 class="vm-detail-title">{% trans "VM Settings" %} <img src="{% static 'hosting/img/settings.svg' %}" class="un-icon"></h2>
@@ -106,194 +106,4 @@
 	    </div>
 	</div>
 	<!-- / Cancel Modal -->
-{% comment %}
-<div>
-	<div class="virtual-machine-container dashboard-container ">
-		<div class="row">
-			<div class="col-md-9 col-md-offset-2">
-				 <div  class="col-sm-12">
-				        <h3><i class="fa fa-cloud fa-separate" aria-hidden="true"></i> {{virtual_machine.name}}</h3>
-				        <hr/>
-				        <div class="col-md-3"> <!-- required for floating -->
-				          <!-- Nav tabs -->
-				          <ul class="nav nav-tabs tabs-left sideways">
-				            <li class="active">
-				            	<a href="#settings-v" data-toggle="tab">
-				            		<i class="fa fa-cogs" aria-hidden="true"></i>
-				            		{% trans "Settings"%}
-				            	</a>
-				            </li>
-				            <li>
-				            	<a href="#billing-v" data-toggle="tab">
-				            		<i class="fa fa-money" aria-hidden="true"></i>
-				            		{% trans "Billing"%}
-				            	</a>
-				            </li>
-				            <li>
-				            	<a href="#status-v" data-toggle="tab">
-				            		<i class="fa fa-signal" aria-hidden="true"></i> {% trans "Status"%}
-				            	</a>
-				            </li>
-				          </ul>
-				        </div>
-
-				        <div class="col-md-9">
-				          <!-- Tab panes -->
-				          <div class="tab-content">
-				            <div class="tab-pane active" id="settings-v">
-				            	<div class="row">
-									<div class="col-md-12 inline-headers">
-									<h3>{{virtual_machine.hosting_company_name}}</h3>
-
-										{% if virtual_machine.ipv6 %}
-											<div class="pull-right right-place">
-												<button type="link"
-					data-clipboard-text="{{virtual_machine.ipv4}}" id="copy_vm_id" class="to_copy btn btn-link"
-													data-toggle="tooltip"  data-placement="bottom" title="Copied"  data-trigger="click">
-														Ipv4: {{virtual_machine.ipv4}} <i class="fa fa-files-o" aria-hidden="true"></i>
-												</button>
-												<button type="link"
-					data-clipboard-text="{{virtual_machine.ipv6}}" id="copy_vm_id" class="to_copy btn btn-link"
-													data-toggle="tooltip"  data-placement="bottom" title="Copied"  data-trigger="click">
-														Ipv6: {{virtual_machine.ipv6}} <i class="fa fa-files-o" aria-hidden="true"></i>
-												</button>
-											</div>
-										{% else %}
-
-											<div class="pull-right right-place">
-												<span class="label label-warning"><strong>{% trans "Ip not assigned yet"%}</strong></span>
-												<i data-toggle="tooltip"  title="Your ip will be assigned soon" class="fa fa-info-circle" aria-hidden="true"></i>
-											</div>
-
-										{% endif %}
-
-									<hr>
-
-									</div>
-				            	</div>
-								<div class="row">
-								  <div class="col-md-12">
-								    <div class="row">
-								      <div class="col-md-3">
-								        <div class="well text-center box-setting">
-								        	<i class="fa fa-cubes" aria-hidden="true"></i>
-								        	<span>{% trans "Cores"%}</span>
-								        	<span class="label label-success">{{virtual_machine.cores}}</span>
-								        </div>
-								      </div>
-								      <div class="col-md-3">
-								        <div class="well text-center box-setting">
-								        	<i class="fa fa-tachometer" aria-hidden="true"></i> {% trans "Memory"%} <br/>
-								        	<span class="label label-success">{{virtual_machine.memory}} GB</span>
-								        </div>
-								      </div>
-								      <div class="col-md-3">
-								        <div class="well text-center box-setting">
-								        	<i class="fa fa-hdd-o" aria-hidden="true"></i>
-								        	<span>{% trans "Disk"%}</span>
-								        	<span class="label label-success">{{virtual_machine.disk_size|floatformat:2}} GB</span>
-								        </div>
-								      </div>
-								    </div><!--/row-->
-								  </div><!--/col-12-->
-								</div><!--/row-->
-								<div class="row">
-									<div class="col-md-12">
-										{% trans "Configuration"%}: {{virtual_machine.configuration}}
-									</div>
-								</div>
-
-
-				            </div>
-				            <div class="tab-pane" id="billing-v">
-
-				            	<div class="row ">
-									<div class="col-md-12 inline-headers">
-										<h3>{% trans "Current pricing"%}</h3>
-										<span class="h3 pull-right"><strong>{{virtual_machine.price|floatformat}} CHF</strong>/month</span>
-										<hr>
-									</div>
-				            	</div>
-				            </div>
-				            <div class="tab-pane" id="status-v">
-				            	<div class="row ">
-									<div class="col-md-12 inline-headers">
-										<h3>{% trans "Current status"%}</h3>
-
-										<div  class="pull-right space-above">
-											{% if virtual_machine.state == 'PENDING' %}
-												<span class="label
-                                                    label-warning"><strong>Pending</strong></span>
-											{% elif  virtual_machine.state == 'ACTIVE' %}
-												<span class="label
-                                                    label-success"><strong>Online</strong></span>
-											{% elif  virtual_machine.state == 'FAILED'%}
-												<span class="label
-                                                    label-danger"><strong>Failed</strong></span>
-											{% endif %}
-										</div>
-									</div>
-				            	</div>
-				            	{% if not virtual_machine.status == 'canceled' %}
-				            	<div class="row">
-									<div class="col-md-12 separate-md">
-										<div class="pull-right">
-											<form method="POST"
-                 id="virtual_machine_cancel_form" class="cancel-form" action="{% url 'hosting:virtual_machines' virtual_machine.vm_id %}">
-											{% csrf_token %}
-											</form>
-
-												<button type="text" data-href="{% url 'hosting:virtual_machines' virtual_machine.vm_id %}" data-toggle="modal" data-target="#confirm-cancel" class="btn btn-danger">{% trans "Terminate Virtual Machine"%}</button>
-
-										</div>
-
-									</div>
-                                    <div class="col-md-12">
-                                        <br/>
-                                        {% if messages %}
-                                            <div class="alert alert-warning">
-                                                {% for message in messages %}
-                                                <span>{{ message }}</span>
-                                                {% endfor %}
-                                            </div>
-                                        {% endif %}
-                                    </div>
-
-									<!-- Cancel Modal -->
-									<div class="modal fade" id="confirm-cancel" tabindex="-1" role="dialog" aria-labelledby="myModalLabel" aria-hidden="true">
-									    <div class="modal-dialog">
-									        <div class="modal-content">
-												<div class="modal-header">
-													<button type="button" class="close" data-dismiss="modal"
-															aria-label="Confirm"><span
-															aria-hidden="true">&times;</span>
-													</button>
-												</div>
-									            <div class="modal-body">
-													<div class="modal-icon"><i class="fa fa-ban" aria-hidden="true"></i></div>
-													<h4 class="modal-title" id="ModalLabel">{% trans "Terminate your Virtual Machine"%}</h4>
-									                <p class="modal-text">{% trans "Are you sure do you want to cancel your Virtual Machine "%} {{virtual_machine.name}} ?</p>
-									            </div>
-									            <div class="modal-footer">
-									                <a class="btn btn-danger btn-ok">OK</a>
-									            </div>
-									        </div>
-									    </div>
-									</div>
-									<!-- / Cancel Modal -->
-				            	</div>
-				            	{% endif %}
-				            </div>
-				          </div>
-				        </div>
-
-				        <div class="clearfix"></div>
-				</div>
-			</div>
-
-	    </div>
-	</div>
-
-</div>
-{% endcomment %}
 {%endblock%}