diff --git a/src/templates/default/module/server/server/list.tpl.html b/src/templates/default/module/server/server/list.tpl.html
index 08e64db3..09a5895b 100644
--- a/src/templates/default/module/server/server/list.tpl.html
+++ b/src/templates/default/module/server/server/list.tpl.html
@@ -1,66 +1,66 @@
-<table class="table table-bordered table-striped">
-	<thead>
-		<tr>
-			<th class="hidden-phone">&nbsp;</th>
-			<th class="hidden-phone">{{ label_label }}</th>
-			<th class="hidden-phone">{{ label_domain }}</th>
-			<th class="visible-desktop">{{ label_port }}</th>
-			<th class="visible-desktop">{{ label_type }}</th>
-			<th class="hidden-phone">{{ label_rtime }}</th>
-			<th class="hidden-phone">{{ label_last_online }}</th>
-			<th class="hidden-phone">{{ label_monitoring }}</th>
-			<th class="hidden-phone">{{ label_action }}</th>
-		</tr>
-	</thead>
-	<tbody>
-		{% for server in servers %}
-		<tr>
-			<td class="hidden-phone"><div class="table-cell-title"><span class="label label-status-{{ server.status }}"><a href="{{ server.url_view|raw }}" title="{{ server.error }}">{{ server.status }}</a></span></div></td>
-			<td class="hidden-phone"><div class="table-cell-title"><a href="{{ server.url_view|raw }}">{{ server.label }}</a></div></td>
-			<td class="nowrap visible-tablet"><div class="table-cell-title"><i class="{{ server.type_icon }}" title="{{ server.type }}"></i> {{ server.ip_short|raw }}</div></td>
-			<td class="nowrap visible-desktop"><div class="table-cell-title">{{ server.ip|raw }}</div></td>
-			<td class="nowrap visible-desktop"><div class="table-cell-title">{{ server.port }}</div></td>
-			<td class="nowrap visible-desktop"><div class="table-cell-title">{{ server.type }}</div></td>
-			<td class="nowrap hidden-phone"><div class="table-cell-title">{{ server.rtime }} s</div></td>
-			<td class="nowrap hidden-phone"><div class="table-cell-title">{{ server.last_online }}</div></td>
-			<td class="tight hidden-phone"><div class="table-cell-title"><i class="{{ server.active_icon }}" title="{{ server.active_title }}"></i> <i class="{{ server.email_icon }}" title="{{ label_email }}"></i> <i class="{{ server.sms_icon }}" title="{{ label_sms }}"></i> <i class="{{ server.pushover_icon }}" title="Pushover"></i></div></td>
-			<td class="tight hidden-phone">
-				<div class="table-cell-title">
-					<a class="btn btn-small" href="{{ server.url_view|raw }}"><i class="icon-chart"></i></a>
-					{% if user_level == 10 %}
-						<a class="btn btn-small" href="{{ server.url_edit|raw }}" title="{{ label_edit }}"><i class="icon-pencil"></i></a>
-						<a class="btn btn-small btn-danger show-modal" href="{{ server.url_delete|raw }}" title="{{ label_delete }}" data-modal-id="delete" data-modal-param="{{ server.label }}"><i class="icon-remove icon-white"></i></a>
-					{% endif %}
-				</div>
-			</td>
-			<td class="visible-phone">
-				<div class="table-body">
-					<div class="table-cell-title">
-						<span class="label label-status-{{ server.status }}"><a href="{{ server.url_view|raw }}" title="{{ server.error }}">{{ server.status }}</a></span>
-						<a class="title" href="{{ server.url_view|raw }}">{{ server.label }}</a>
-					</div>
-					<div class="table-cell tight">
-						&nbsp;<a class="btn btn-small" href="{{ server.url_view|raw }}"><i class="icon-chart"></i></a>
-						{% if user_level == 10 %}
-							<a class="btn btn-small" href="{{ server.url_edit|raw }}" title="{{ label_edit }}"><i class="icon-pencil"></i></a>
-							<a class="btn btn-small btn-danger show-modal" href="{{ server.url_delete|raw }}" title="{{ label_delete }}" data-modal-id="delete" data-modal-param="{{ server.label }}"><i class="icon-remove icon-white"></i></a>
-						{% endif %}
-					</div>
-				</div>
-				<div class="table-body">
-					<div class="table-row">
-						<div class="table-cell"><i class="{{ server.type_icon }}" title="{{ server.type }}"></i> {{ server.ip_short|raw }}</div>
-						<div class="table-cell tight">
-							<i class="{{ server.active_icon }}" title="{{ server.active_title }}"></i> <i class="{{ server.email_icon }}" title="{{ label_email }}"></i> <i class="{{ server.sms_icon }}" title="{{ label_sms }}"></i> <i class="{{ server.pushover_icon }}" title="Pushover"></i>
-						</div>
-					</div>
-				</div>
-				<div class="table-body">
-					<div class="table-row"><div class="table-cell-details tight">{{ label_rtime }}: &nbsp;</div><div class="table-cell-details">{{ server.rtime }} s</div></div>
-					<div class="table-row"><div class="table-cell-details tight">{{ label_last_online }}: &nbsp;</div><div class="table-cell-details">{{ server.last_online }}</div></div>
-				</div>
-			</td>
-		</tr>
-		{% endfor %}
-	</tbody>
+<table class="table table-bordered table-striped">
+	<thead>
+		<tr>
+			<th class="hidden-phone">&nbsp;</th>
+			<th class="hidden-phone">{{ label_label }}</th>
+			<th class="hidden-phone">{{ label_domain }}</th>
+			<th class="visible-desktop">{{ label_port }}</th>
+			<th class="visible-desktop">{{ label_type }}</th>
+			<th class="hidden-phone">{{ label_rtime }}</th>
+			<th class="hidden-phone">{{ label_last_online }}</th>
+			<th class="hidden-phone">{{ label_monitoring }}</th>
+			<th class="hidden-phone">{{ label_action }}</th>
+		</tr>
+	</thead>
+	<tbody>
+		{% for server in servers %}
+		<tr>
+			<td class="hidden-phone"><div class="table-cell-title"><span class="label label-status-{{ server.status }}"><a href="{{ server.url_view|raw }}" title="{{ server.error }}">{{ server.status }}</a></span></div></td>
+			<td class="hidden-phone"><div class="table-cell-title"><a href="{{ server.url_view|raw }}">{{ server.label }}</a></div></td>
+			<td class="nowrap visible-tablet"><div class="table-cell-title"><i class="{{ server.type_icon }}" title="{{ server.type }}"></i> {{ server.ip_short|raw }}</div></td>
+			<td class="nowrap visible-desktop"><div class="table-cell-title">{{ server.ip|raw }}</div></td>
+			<td class="nowrap visible-desktop"><div class="table-cell-title">{{ server.port }}</div></td>
+			<td class="nowrap visible-desktop"><div class="table-cell-title">{{ server.type }}</div></td>
+			<td class="nowrap hidden-phone"><div class="table-cell-title">{{ server.rtime }} s</div></td>
+			<td class="nowrap hidden-phone"><div class="table-cell-title">{{ server.last_online }}</div></td>
+			<td class="tight hidden-phone"><div class="table-cell-title"><i class="{{ server.active_icon }}" title="{{ server.active_title }}"></i> <i class="{{ server.email_icon }}" title="{{ label_email }}"></i> <i class="{{ server.sms_icon }}" title="{{ label_sms }}"></i> <i class="{{ server.pushover_icon }}" title="Pushover"></i> <i class="{{ server.pushsafer_icon }}" title="Pushsafer"></i></div></td>
+			<td class="tight hidden-phone">
+				<div class="table-cell-title">
+					<a class="btn btn-small" href="{{ server.url_view|raw }}"><i class="icon-chart"></i></a>
+					{% if user_level == 10 %}
+						<a class="btn btn-small" href="{{ server.url_edit|raw }}" title="{{ label_edit }}"><i class="icon-pencil"></i></a>
+						<a class="btn btn-small btn-danger show-modal" href="{{ server.url_delete|raw }}" title="{{ label_delete }}" data-modal-id="delete" data-modal-param="{{ server.label }}"><i class="icon-remove icon-white"></i></a>
+					{% endif %}
+				</div>
+			</td>
+			<td class="visible-phone">
+				<div class="table-body">
+					<div class="table-cell-title">
+						<span class="label label-status-{{ server.status }}"><a href="{{ server.url_view|raw }}" title="{{ server.error }}">{{ server.status }}</a></span>
+						<a class="title" href="{{ server.url_view|raw }}">{{ server.label }}</a>
+					</div>
+					<div class="table-cell tight">
+						&nbsp;<a class="btn btn-small" href="{{ server.url_view|raw }}"><i class="icon-chart"></i></a>
+						{% if user_level == 10 %}
+							<a class="btn btn-small" href="{{ server.url_edit|raw }}" title="{{ label_edit }}"><i class="icon-pencil"></i></a>
+							<a class="btn btn-small btn-danger show-modal" href="{{ server.url_delete|raw }}" title="{{ label_delete }}" data-modal-id="delete" data-modal-param="{{ server.label }}"><i class="icon-remove icon-white"></i></a>
+						{% endif %}
+					</div>
+				</div>
+				<div class="table-body">
+					<div class="table-row">
+						<div class="table-cell"><i class="{{ server.type_icon }}" title="{{ server.type }}"></i> {{ server.ip_short|raw }}</div>
+						<div class="table-cell tight">
+							<i class="{{ server.active_icon }}" title="{{ server.active_title }}"></i> <i class="{{ server.email_icon }}" title="{{ label_email }}"></i> <i class="{{ server.sms_icon }}" title="{{ label_sms }}"></i> <i class="{{ server.pushover_icon }}" title="Pushover"></i> <i class="{{ server.pushsafer_icon }}" title="Pushsafer"></i>
+						</div>
+					</div>
+				</div>
+				<div class="table-body">
+					<div class="table-row"><div class="table-cell-details tight">{{ label_rtime }}: &nbsp;</div><div class="table-cell-details">{{ server.rtime }} s</div></div>
+					<div class="table-row"><div class="table-cell-details tight">{{ label_last_online }}: &nbsp;</div><div class="table-cell-details">{{ server.last_online }}</div></div>
+				</div>
+			</td>
+		</tr>
+		{% endfor %}
+	</tbody>
 </table>
\ No newline at end of file
diff --git a/src/templates/default/module/server/server/update.tpl.html b/src/templates/default/module/server/server/update.tpl.html
index 4f26e357..1d8023d3 100644
--- a/src/templates/default/module/server/server/update.tpl.html
+++ b/src/templates/default/module/server/server/update.tpl.html
@@ -1,161 +1,117 @@
-{% import 'main/macros.tpl.html' as macro %}
-<form class="form-horizontal well" action="{{ url_save|raw }}" method="post" autocomplete="off">
-	{{ macro.csrf_input() }}
-	<fieldset>
-		<legend>{{ titlemode }}</legend>
-		<div class="control-group">
-			<label class="control-label" for="label">{{ label_label }}</label>
-			<div class="controls">
-				<input type="text" id="label" name="label" value="{{ edit_value_label }}" maxlength="255" />
-			</div>
-		</div>
-		<div class="control-group">
-			<label class="control-label" for="ip">{{ label_domain }}</label>
-			<div class="controls">
-				<input type="text" id="ip" name="ip" value="{{ edit_value_ip }}" maxlength="500" />
-			</div>
-		</div>
-		<div class="control-group">
-			<label class="control-label" for="type">{{ label_type }}</label>
-			<div class="controls">
-				<select id="type" name="type">
-					<option value="">{{ label_please_select }}</option>
-					<option value="ping" {{ edit_type_selected_ping|raw }}>{{ label_ping }}</option>
-					<option value="service" {{ edit_type_selected_service|raw }}>{{ label_service }}</option>
-					<option value="website" {{ edit_type_selected_website|raw }}>{{ label_website }}</option>
-				 </select>
-			</div>
-		</div>
-		<div class="control-group popularPortsGroup types typeService">
-			<label class="control-label" for="popularPorts">{{ label_port }}</label>
-			<div class="controls">
-				<select id="popularPorts" name="popularPorts">
-                    <option value="">{{ label_please_select }}</option>
-                    <option value="custom">{{ label_custom_port }}</option>
-                    <optgroup label="{{ label_popular_ports }}">
-                        <option value="80">HTTP (80)</option>
-                        <option value="443">HTTPS (443)</option>
-                        <option value="21">FTP (21)</option>
-                        <option value="25">SMTP (25)</option>
-                        <option value="465">SMTP Secure (465)</option>
-                        <option value="110">POP3 (110)</option>
-                        <option value="995">POP3 Secure (995)</option>
-                        <option value="143">IMAP (143)</option>
-                        <option value="993">IMAP over SSL (993)</option>
-                        <option value="22">SSH (22)</option>
-                        <option value="389">LDAP (389)</option>
-                        <option value="3306">MySQL (3306)</option>
-                        <option value="115">SFTP (115)</option>
-                        <option value="43">WHOIS (43)</option>
-                        <option value="53">BIND (53)</option>
-                        <option value="3389">RDP (3389)</option>
-                    </optgroup>
-				</select>
-			</div>
-		</div>
-		<div class="control-group portGroup types typeService">
-			<label class="control-label" for="port">{{ label_custom_port }}</label>
-			<div class="controls">
-				<input class="input-mini" type="text" id="port" name="port" value="{{ edit_value_port }}" maxlength="5" />
-			</div>
-		</div>
-		<div class="control-group types typeWebsite">
-			<label class="control-label" for="pattern">{{ label_pattern }}</label>
-			<div class="controls">
-				<input type="text" id="pattern" name="pattern" value="{{ edit_value_pattern }}" maxlength="255" data-toggle="tooltip" title="{{ label_pattern_description }}" />
-			</div>
-		</div>
-		<div class="control-group">
-			<label class="control-label" for="warning_threshold">{{ label_warning_threshold }}</label>
-			<div class="controls">
-				<input class="input-mini" type="text" id="warning_threshold" name="warning_threshold" value="{{ edit_value_warning_threshold }}" maxlength="5" data-toggle="tooltip" title="{{ label_warning_threshold_description }}" />
-			</div>
-		</div>
-		<div class="control-group types typeWebsite">
-			<label class="control-label" for="timeout">{{ label_timeout }}</label>
-			<div class="controls">
-				<input class="input-mini" type="text" id="timeout" name="timeout" value="{{ edit_value_timeout }}" placeholder="{{ default_value_timeout }}" maxlength="10" data-toggle="tooltip" title="{{ label_timeout_description }}" /> s
-			</div>
-		</div>
-	</fieldset>
-
-	<fieldset>
-		<legend class="types typeWebsite">{{ label_authentication_settings}}</legend>
-		<div class="control-group types typeWebsite">
-			<label class="control-label" for="website_username">{{ label_website_username }}</label>
-			<div class="controls">
-				<input type="text" id="website_username" name="website_username" value="{{ edit_website_username }}" data-toggle="tooltip" title="{{ label_website_username_description }}" autocomplete="off" readonly onfocus="this.removeAttribute('readonly');"/>
-			</div>
-		</div>
-		<div class="control-group types typeWebsite">
-			<label class="control-label" for="website_password">{{ label_website_password }}</label>
-			<div class="controls">
-				<input type="password" id="website_password" name="website_password" value="{{ edit_website_password }}" data-toggle="tooltip" title="{{ label_website_password_description }}" autocomplete="off" readonly onfocus="this.removeAttribute('readonly');"/>
-			</div>
-		</div>
-	</fieldset>
-
-	<fieldset>
-		<legend>{{ label_fieldset_monitoring }}</legend>
-		<div class="control-group">
-			<label class="control-label" for="active">{{ label_monitoring }}</label>
-			<div class="controls">
-				<select id="active" name="active">
-					<option value="yes" {{ edit_active_selected_yes|raw }}>{{ label_yes }}</option>
-					<option value="no" {{ edit_active_selected_no|raw }}>{{ label_no }}</option>
-				</select>
-			</div>
-		</div>
-		<div class="control-group {{ control_class_email }}">
-			<label class="control-label" for="email">{{ label_send_email }}
-			{% if warning_email %} <p class="help-inline"><i class="icon-warning-sign" data-toggle="tooltip" title="{{ label_warning_email }}"></i></p> {% endif %}
-			</label>
-			<div class="controls">
-				<select id="email" name="email">
-					<option value="yes" {{ edit_email_selected_yes|raw }}>{{ label_yes }}</option>
-					<option value="no" {{ edit_email_selected_no|raw }}>{{ label_no }}</option>
-				 </select>
-			</div>
-		</div>
-		<div class="control-group {{ control_class_sms }}">
-			<label class="control-label" for="sms">{{ label_send_sms }}
-			{% if warning_sms %} <p class="help-inline"><i class="icon-warning-sign" data-toggle="tooltip" title="{{ label_warning_sms }}"></i></p> {% endif %}
-			</label>
-			<div class="controls">
-				<select id="sms" name="sms">
-					<option value="yes" {{ edit_sms_selected_yes|raw }}>{{ label_yes }}</option>
-					<option value="no" {{ edit_sms_selected_no|raw }}>{{ label_no }}</option>
-				</select>
-			</div>
-		</div>
-		<div class="control-group {{ control_class_pushover }}">
-			<label class="control-label" for="pushover">{{ label_pushover }}
-			{% if warning_pushover %} <p class="help-inline"><i class="icon-warning-sign" data-toggle="tooltip" title="{{ label_warning_pushover }}"></i></p> {% endif %}
-			</label>
-			<div class="controls">
-				<select id="pushover" name="pushover">
-					<option value="yes" {{ edit_pushover_selected_yes|raw }}>{{ label_yes }}</option>
-					<option value="no" {{ edit_pushover_selected_no|raw }}>{{ label_no }}</option>
-				</select>
-			</div>
-		</div>
-	</fieldset>
-
-	<fieldset>
-		<legend>{{ label_fieldset_permissions }}</legend>
-		<div class="control-group">
-			<label class="control-label" for="user_id">{{ label_users }}</label>
-			<div class="controls">
-				<select class="multiselect" multiple="multiple" id="user_id" name="user_id[]">
-					{% for user in users %}
-					<option value="{{ user.user_id }}" {{ user.edit_selected|raw }}> {{ user.name }}</option>
-					{% endfor %}
-				</select>
-			</div>
-		</div>
-		<div class="form-actions">
-			<button class="btn btn-success" type="submit">{{ label_save }}</button>
-			<a class="btn" href="{{ url_go_back|raw }}" >{{ label_go_back }}</a>
-		</div>
-	</fieldset>
-</form>
+<form class="form-horizontal well" action="{{ url_save|raw }}" method="post">
+	<fieldset>
+		<legend>{{ titlemode }}</legend>
+		<div class="control-group">
+			<label class="control-label" for="label">{{ label_label }}</label>
+			<div class="controls">
+				<input type="text" id="label" name="label" value="{{ edit_value_label }}" maxlength="255" />
+			</div>
+		</div>
+		<div class="control-group">
+			<label class="control-label" for="ip">{{ label_domain }}</label>
+			<div class="controls">
+				<input type="text" id="ip" name="ip" value="{{ edit_value_ip }}" maxlength="100" />
+			</div>
+		</div>
+		<div class="control-group">
+			<label class="control-label" for="type">{{ label_type }}</label>
+			<div class="controls">
+				<select id="type" name="type">
+					<option value="service" {{ edit_type_selected_service|raw }}>{{ label_service }}</option>
+					<option value="website" {{ edit_type_selected_website|raw }}>{{ label_website }}</option>
+				 </select>
+			</div>
+		</div>
+		<div class="control-group">
+			<label class="control-label" for="port">{{ label_port }}</label>
+			<div class="controls">
+				<input class="input-mini" type="text" id="port" name="port" value="{{ edit_value_port }}" maxlength="5" />
+			</div>
+		</div>
+		<div class="control-group">
+			<label class="control-label" for="pattern">{{ label_pattern }}</label>
+			<div class="controls">
+				<input type="text" id="pattern" name="pattern" value="{{ edit_value_pattern }}" maxlength="255" data-toggle="tooltip" title="{{ label_pattern_description }}" />
+			</div>
+		</div>
+		<div class="control-group">
+			<label class="control-label" for="warning_threshold">{{ label_warning_threshold }}</label>
+			<div class="controls">
+				<input class="input-mini" type="text" id="warning_threshold" name="warning_threshold" value="{{ edit_value_warning_threshold }}" maxlength="5" data-toggle="tooltip" title="{{ label_warning_threshold_description }}" />
+			</div>
+		</div>
+		<div class="control-group">
+			<label class="control-label" for="timeout">{{ label_timeout }}</label>
+			<div class="controls">
+				<input class="input-mini" type="text" id="timeout" name="timeout" value="{{ edit_value_timeout }}" placeholder="{{ default_value_timeout }}" maxlength="10" data-toggle="tooltip" title="{{ label_timeout_description }}" /> s
+			</div>
+		</div>
+		<div class="control-group">
+			<label class="control-label" for="active">{{ label_monitoring }}</label>
+			<div class="controls">
+				<select id="active" name="active">
+					<option value="yes" {{ edit_active_selected_yes|raw }}>{{ label_yes }}</option>
+					<option value="no" {{ edit_active_selected_no|raw }}>{{ label_no }}</option>
+				</select>
+			</div>
+		</div>
+		<div class="control-group {{ control_class_email }}">
+			<label class="control-label" for="email">{{ label_send_email }}
+			{% if warning_email %} <p class="help-inline"><i class="icon-warning-sign" data-toggle="tooltip" title="{{ label_warning_email }}"></i></p> {% endif %}
+			</label>
+			<div class="controls">
+				<select id="email" name="email">
+					<option value="yes" {{ edit_email_selected_yes|raw }}>{{ label_yes }}</option>
+					<option value="no" {{ edit_email_selected_no|raw }}>{{ label_no }}</option>
+				 </select>
+			</div>
+		</div>
+		<div class="control-group {{ control_class_sms }}">
+			<label class="control-label" for="sms">{{ label_send_sms }}
+			{% if warning_sms %} <p class="help-inline"><i class="icon-warning-sign" data-toggle="tooltip" title="{{ label_warning_sms }}"></i></p> {% endif %}
+			</label>
+			<div class="controls">
+				<select id="sms" name="sms">
+					<option value="yes" {{ edit_sms_selected_yes|raw }}>{{ label_yes }}</option>
+					<option value="no" {{ edit_sms_selected_no|raw }}>{{ label_no }}</option>
+				</select>
+			</div>
+		</div>
+		<div class="control-group {{ control_class_pushover }}">
+			<label class="control-label" for="pushover">{{ label_pushover }}
+			{% if warning_pushover %} <p class="help-inline"><i class="icon-warning-sign" data-toggle="tooltip" title="{{ label_warning_pushover }}"></i></p> {% endif %}
+			</label>
+			<div class="controls">
+				<select id="pushover" name="pushover">
+					<option value="yes" {{ edit_pushover_selected_yes|raw }}>{{ label_yes }}</option>
+					<option value="no" {{ edit_pushover_selected_no|raw }}>{{ label_no }}</option>
+				</select>
+			</div>
+		</div>
+		<div class="control-group {{ control_class_pushsafer }}">
+			<label class="control-label" for="pushsafer">{{ label_pushsafer }}
+			{% if warning_pushsafer %} <p class="help-inline"><i class="icon-warning-sign" data-toggle="tooltip" title="{{ label_warning_pushsafer }}"></i></p> {% endif %}
+			</label>
+			<div class="controls">
+				<select id="pushsafer" name="pushsafer">
+					<option value="yes" {{ edit_pushsafer_selected_yes|raw }}>{{ label_yes }}</option>
+					<option value="no" {{ edit_pushsafer_selected_no|raw }}>{{ label_no }}</option>
+				</select>
+			</div>
+		</div>		
+		<div class="control-group">
+			<label class="control-label" for="user_id">{{ label_users }}</label>
+			<div class="controls">
+				<select class="multiselect" multiple="multiple" id="user_id" name="user_id[]">
+					{% for user in users %}
+					<option value="{{ user.user_id }}" {{ user.edit_selected|raw }}> {{ user.name }}</option>
+					{% endfor %}
+				</select>
+			</div>
+		</div>
+		<div class="form-actions">
+			<button class="btn btn-success" type="submit">{{ label_save }}</button>
+			<a class="btn" href="{{ url_go_back|raw }}" >{{ label_go_back }}</a>
+		</div>
+	</fieldset>
+</form>
\ No newline at end of file
diff --git a/src/templates/default/module/server/server/view.tpl.html b/src/templates/default/module/server/server/view.tpl.html
index 17dad262..bd9336ea 100644
--- a/src/templates/default/module/server/server/view.tpl.html
+++ b/src/templates/default/module/server/server/view.tpl.html
@@ -1,103 +1,95 @@
-<table class="table table-bordered">
-	<colgroup>
-		<col class="oce-first" />
-		<col />
-	</colgroup>
-	<thead>
-		<tr class="head">
-			<th colspan="2">
-				<div class="btn-group">
-				  <button class="btn btn-success dropdown-toggle" data-toggle="dropdown">
-					<i class="icon-th icon-white"></i>&nbsp;{{ label }}
-					<span class="caret"></span>
-				  </button>
-				  <ul class="dropdown-menu">
-					{% for option in options %}
-					<li class="{{ option.class_active }}"><a href="{{ option.url|raw }}">{{ option.label }}</a>
-					{% endfor %}
-				  </ul>
-				</div>
-			</th>
-		</tr>
-	</thead>
-	<tbody>
-		<tr>
-			<td>{{ label_status }}:</td>
-			<td>
-				<span class="label label-status-{{ status }}">
-					<a href="#" title="{{ error }}">{{ status }}</a>
-				</span>&nbsp;{{ error }}
-			</td>
-		</tr>
-		<tr>
-			<td>{{ label_type }}:</td>
-			<td>{{ type }}</td>
-		</tr>
-		<tr>
-			<td>{{ label_domain }}:</td>
-			<td>{{ ip|raw }}</td>
-		</tr>
-		<tr>
-			<td>{{ label_port }}:</td>
-			<td>{{ port }}</td>
-		</tr>
-		<tr>
-			<td>{{ label_last_check }}:</td>
-			<td>{{ last_check }}</td>
-		</tr>
-		<tr>
-			<td>{{ label_last_online }}:</td>
-			<td>{{ last_online }}</td>
-		</tr>
-		<tr>
-			<td>{{ label_rtime }}:</td>
-			<td>{{ rtime }} s</td>
-		</tr>
-		<tr>
-			<td>{{ label_monitoring }}:</td>
-			<td>{{ active }}</td>
-		</tr>
-		<tr>
-			<td>{{ label_email }}:</td>
-			<td>{{ email }}</td>
-		</tr>
-		<tr>
-			<td>{{ label_sms }}:</td>
-			<td>{{ sms }}</td>
-		</tr>
-		<tr>
-			<td>{{ label_pushover }}:</td>
-			<td>{{ pushover }}</td>
-		</tr>
-		<tr>
-			<td>{{ label_timeout }}:</td>
-			<td>{{ timeout }} s</td>
-		</tr>
-		<tr>
-			<td>{{ label_website_username }}:</td>
-			<td>{{ website_username }}</td>
-		</tr>
-		<tr>
-			<td>{{ label_website_password }}:</td>
-			<td>
-                {% if (website_password is not empty) %}
-				******
-				{% endif %}
-			</td>
-		</tr>
-		{% if has_admin_actions %}
-		<tr>
-			<td class="hidden-small">&nbsp;</td>
-			<td class="action-small" colspan="2">
-				<a class="btn btn-success" href="{{ url_edit|raw }}">
-					<i class="icon-edit icon-white"></i>&nbsp;{{ label_edit }}
-				</a>
-				<a class="btn btn-danger show-modal" href="{{ url_delete|raw }}" data-modal-id="delete" data-modal-param="{{ label }}">
-					<i class="icon-remove icon-white"></i>&nbsp;{{ label_delete }}
-				</a>
-			</td>
-		</tr>
-		{% endif %}
-	</tbody>
-</table>
+<table class="table table-bordered">
+	<colgroup>
+		<col class="oce-first" />
+		<col />
+	</colgroup>
+	<thead>
+		<tr class="head">
+			<th colspan="2">
+				<div class="btn-group">
+				  <button class="btn btn-success dropdown-toggle" data-toggle="dropdown">
+					<i class="icon-th icon-white"></i>&nbsp;{{ label }}
+					<span class="caret"></span>
+				  </button>
+				  <ul class="dropdown-menu">
+					{% for option in options %}
+					<li class="{{ option.class_active }}"><a href="{{ option.url|raw }}">{{ option.label }}</a>
+					{% endfor %}
+				  </ul>
+				</div>
+			</th>
+		</tr>
+	</thead>
+	<tbody>
+		<tr>
+			<td>{{ label_status }}:</td>
+			<td>
+				<span class="label label-status-{{ status }}">
+					<a href="#" title="{{ error }}">{{ status }}</a>
+				</span>&nbsp;{{ error }}
+			</td>
+		</tr>
+		<tr>
+			<td>{{ label_type }}:</td>
+			<td>{{ type }}</td>
+		</tr>
+		<tr>
+			<td>{{ label_domain }}:</td>
+			<td>{{ ip|raw }}</td>
+		</tr>
+		<tr>
+			<td>{{ label_port }}:</td>
+			<td>{{ port }}</td>
+		</tr>
+		<tr>
+			<td>{{ label_last_check }}:</td>
+			<td>{{ last_check }}</td>
+		</tr>
+		<tr>
+			<td>{{ label_last_online }}:</td>
+			<td>{{ last_online }}</td>
+		</tr>
+		<tr>
+			<td>{{ label_rtime }}:</td>
+			<td>{{ rtime }} s</td>
+		</tr>
+		<tr>
+			<td>{{ label_monitoring }}:</td>
+			<td>{{ active }}</td>
+		</tr>
+		<tr>
+			<td>{{ label_email }}:</td>
+			<td>{{ email }}</td>
+		</tr>
+		<tr>
+			<td>{{ label_sms }}:</td>
+			<td>{{ sms }}</td>
+		</tr>
+		<tr>
+			<td>{{ label_pushover }}:</td>
+			<td>{{ pushover }}</td>
+		</tr>
+		<tr>
+			<td>{{ label_pushsafer }}:</td>
+			<td>{{ pushsafer }}</td>
+		</tr>		
+		<tr>
+			<td>{{ label_timeout }}:</td>
+			<td>{{ timeout }} s</td>
+		</tr>
+		{% if has_admin_actions %}
+		<tr>
+			<td class="hidden-small">&nbsp;</td>
+			<td class="action-small" colspan="2">
+				<a class="btn btn-success" href="{{ url_edit|raw }}">
+					<i class="icon-edit icon-white"></i>&nbsp;{{ label_edit }}
+				</a>
+				<a class="btn btn-danger show-modal" href="{{ url_delete|raw }}" data-modal-id="delete" data-modal-param="{{ label }}">
+					<i class="icon-remove icon-white"></i>&nbsp;{{ label_delete }}
+				</a>
+			</td>
+		</tr>
+		{% endif %}
+	</tbody>
+</table>
 {{ html_history|raw }}
\ No newline at end of file