diff --git a/modules/sasl/tmpl/index.tmpl b/modules/sasl/tmpl/index.tmpl
index a52a9a6..2cde4d3 100644
--- a/modules/sasl/tmpl/index.tmpl
+++ b/modules/sasl/tmpl/index.tmpl
@@ -1,140 +1,77 @@
+<? I18N znc-sasl ?>
 <? INC Header.tmpl ?>
 
 <div class="container col-md-10 col-md-offset-1">
 	<div class="panel panel-default">
-		<div class="panel-heading">Simple Authentication and Security Layer (SASL)</div>
-			<div class="panel-body">
-        <form class="form-horizontal" action="<? VAR URIPrefix TOP ?><? VAR ModPath TOP ?>" method="post">
+		<div class="panel-heading"><? FORMAT "SASL" ?></div>
+			<form class="form-horizontal" action="<? VAR URIPrefix TOP ?><? VAR ModPath TOP ?>" method="post">
+				<div class="panel-body">
 				<? INC _csrf_check.tmpl ?>
 
-				<div class="form-group">
-					<label for="inputSASLUsername" class="col-sm-2 control-label">Username:</label>
+					<div class="form-group">
+						<label for="inputSASLUsername" class="col-sm-2 control-label"><? FORMAT "Username:" ?></label>
 						<div class="col-sm-10">
-							<input type="text" class="form-control" id="inputSASLUsername" name="username" maxlength="128" placeholder="Enter a Username">
+							<input type="text" class="form-control" id="inputSASLUsername" name="username" maxlength="128" placeholder="<? FORMAT "Please enter a username." ?>">
 						</div>
-				</div>
+					</div>
 
-				<div class="form-group">
-					<label for="inputSASLPassword" class="col-sm-2 control-label">Password:</label>
+					<div class="form-group">
+						<label for="inputSASLPassword" class="col-sm-2 control-label"><? FORMAT "Password:" ?></label>
 						<div class="col-sm-10">
-							<input type="text" class="form-control" id="inputSASLPassword" name="username" placeholder="Enter a Password" autocomplete="off">
+							<input type="text" class="form-control" id="inputSASLPassword" name="username" placeholder="<? FORMAT "Please enter a password." ?>" autocomplete="off">
 						</div>
-				</div>
+					</div>
 
-				<div class="form-group">
-					<label for="inputSASLUsername" class="col-sm-2 control-label">Connect:</label>
+					<div class="form-group">
+						<label for="inputSASLUsername" class="col-sm-2 control-label"><? FORMAT "Options" ?></label>
 						<div class="col-sm-10">
 							<div class="switch">
 								<input type="checkbox" name="require_auth" id="opt_require_auth" class="cmn-toggle cmn-toggle-round-flat" value="1"<? IF RequireAuth ?> checked="checked"<? ENDIF ?> />
 								<label for="opt_require_auth"></label>
-								<span class="help-block">Connect only if SASL authentication succeeds. Require authentication</span>
+								<span class="help-block"><? FORMAT "Connect only if SASL authentication succeeds." ?></span>
 							</div>
 						</div>
-				</div>
-
-
+					</div>
 
-
-			</div>
-			<div class="panel-footer text-right">
-				<input class="btn btn-danger" type="reset" value="Reset">
-				<input class="btn btn-success" type="submit" name="save" value="Save" />
-			</div>
-				</form>
+					<div class="form-group">
+						<label for="inputMechanismsDescription" class="col-sm-2 control-label"><? FORMAT "Mechanisms" ?></label>
+						<div class="col-sm-10">
+							<table class="data">
+								<thead>
+										<tr>
+												<th><? FORMAT "Name" ?></th>
+												<th><? FORMAT "Description" ?></th>
+										</tr>
+								</thead>
+								<tbody>
+										<? LOOP MechanismLoop SORTASC=Name ?>
+										<tr class="<? IF __EVEN__ ?>evenrow<? ELSE ?>oddrow<? ENDIF ?>">
+												<td><? VAR Name ?></td>
+												<td><? VAR Description ?></td>
+										</tr>
+										<? ENDLOOP ?>
+								</tbody>
+						</table>
+							
+						</div>
+						<label for="inputMechanisms" class="col-sm-2 control-label"><? FORMAT "Selected mechanisms and their order:" ?></label>
+						<div class="col-sm-10">
+							<input type="text" class="form-control" id="inputMechanisms" name="mechanisms" value="<? VAR Mechanisms ?>">
+							<script>
+							$("#inputMechanisms").selectize({
+									plugins: ["drag_drop"],
+									delimiter: " ",
+									options: [<? LOOP MechanismLoop SORTASC=Name ?>{value:"<? VAR Name ?>",text:"<? VAR Name ?>"},<? ENDLOOP ?>],
+							});
+							</script>
+						</div>
+					</div>
+				<div class="panel-footer text-right">
+					<input class="btn btn-danger" type="reset" value="Reset">
+					<input class="btn btn-success" type="submit" name="save" value="<? FORMAT "Save" ?>" />
+				</div>
+			</form>
 	</div>
 </div>
 
 <? INC Footer.tmpl ?>
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-<!--
-	<div class="section">
-		<h3></h3>
-		<div class="sectionbg">
-			<div class="sectionbody">
-				<div class="subsection">
-					<div class="inputlabel">Username:</div>
-					<input type="text" name="username" value="<? VAR Username ?>" class="half" maxlength="128"
-							   title="Please enter a username." />
-				</div>
-				<div class="subsection">
-					<div class="inputlabel">Password:</div>
-					<input type="password" name="password" class="half"
-						   title="Please enter a password." autocomplete="off" />
-				</div>
-			</div>
-		</div>
-		<h3>Options</h3>
-		<div class="sectionbg">
-			<div class="sectionbody lotsofcheckboxes">
-				<span class="checkboxandlabel" title="Connect only if SASL authentication succeeds.">
-					<input type="checkbox" name="require_auth" id="opt_require_auth" value="1"<? IF RequireAuth ?> checked="checked"<? ENDIF ?> />
-					<label for="opt_require_auth">Require authentication</label>
-				</span>
-				<div style="clear:both;"></div>
-			</div>
-		</div>
-	</div>
-
-	<div class="section">
-		<h3>Mechanisms</h3>
-		<div class="sectionbg">
-			<div class="sectionbody">
-				<div class="subsection">
-					<table class="data">
-						<thead>
-							<tr>
-								<td>Name</td>
-								<td>Description</td>
-							</tr>
-						</thead>
-						<tbody>
-							<? LOOP MechanismLoop SORTASC=Name ?>
-							<tr class="<? IF __EVEN__ ?>evenrow<? ELSE ?>oddrow<? ENDIF ?>">
-								<td><? VAR Name ?></td>
-								<td><? VAR Description ?></td>
-							</tr>
-							<? ENDLOOP ?>
-						</tbody>
-					</table>
-				</div>
-				<div class="subsection">
-					<div class="inputlabel">Selected mechanisms and their order:</div>
-					<input type="text" name="mechanisms" id="mechanisms" value="<? VAR Mechanisms ?>" class="half"/>
-					<script>
-					$("#mechanisms").selectize({
-						plugins: ["drag_drop"],
-						delimiter: " ",
-						options: [<? LOOP MechanismLoop SORTASC=Name ?>{value:"<? VAR Name ?>",text:"<? VAR Name ?>"},<? ENDLOOP ?>],
-					});
-					</script>
-				</div>
-			</div>
-		</div>
-	</div>
-	<div style="clear:both;"></div>
-
-	<div class="submitline">
-		<input type="hidden" name="submitted" value="1" />
-		<input type="submit" value="Save" />
-	</div>
-</form>
--->