diff --git a/apps/basic/views/site/login.php b/apps/basic/views/site/login.php
index 524b0cc..f1a02b5 100644
--- a/apps/basic/views/site/login.php
+++ b/apps/basic/views/site/login.php
@@ -15,20 +15,32 @@ $this->params['breadcrumbs'][] = $this->title;
 
 	<p>Please fill out the following fields to login:</p>
 
-	<div class="row">
-		<div class="col-lg-3">
-			<?php $form = ActiveForm::begin(array('id' => 'login-form')); ?>
-				<?php echo $form->field($model, 'username'); ?>
-				<?php echo $form->field($model, 'password')->passwordInput(); ?>
-				<?php echo $form->field($model, 'rememberMe')->checkbox(); ?>
-				<div class="form-group">
-					<?php echo Html::submitButton('Login', array('class' => 'btn btn-primary')); ?>
-				</div>
-			<?php ActiveForm::end(); ?>
-		</div>
-		<div class="col-lg-5" style="color:#999;margin:1em;padding-top:60px">
-			You may login with <strong>admin/admin</strong> or <strong>demo/demo</strong>.<br>
-			To modify the username/password, please check out the code <code>app\models\User::$users</code>.
+	<?php $form = ActiveForm::begin(array(
+		'id' => 'login-form',
+		'options' => array('class' => 'form-horizontal'),
+		'fieldConfig' => array(
+			'template' => "<div class=\"col-lg-1\">{label}</div>\n<div class=\"col-lg-3\">{input}</div>\n<div class=\"col-lg-8\">{error}</div>",
+		),
+	)); ?>
+
+		<?php echo $form->field($model, 'username'); ?>
+
+		<?php echo $form->field($model, 'password')->passwordInput(); ?>
+
+		<?php echo $form->field($model, 'rememberMe', array(
+			'template' => "<div class=\"col-lg-offset-1 col-lg-3\">{input}</div>\n<div class=\"col-lg-8\">{error}</div>",
+		))->checkbox(); ?>
+
+		<div class="form-group">
+			<div class="col-lg-offset-1 col-lg-11">
+				<?php echo Html::submitButton('Login', array('class' => 'btn btn-primary')); ?>
+			</div>
 		</div>
+
+	<?php ActiveForm::end(); ?>
+
+	<div class="col-lg-offset-1" style="color:#999;">
+		You may login with <strong>admin/admin</strong> or <strong>demo/demo</strong>.<br>
+		To modify the username/password, please check out the code <code>app\models\User::$users</code>.
 	</div>
 </div>