diff --git a/modules/registration/views/registration/activation_failure.php b/modules/registration/views/registration/activation_failure.php
index 96889c3..15d1860 100644
--- a/modules/registration/views/registration/activation_failure.php
+++ b/modules/registration/views/registration/activation_failure.php
@@ -1,4 +1,4 @@
-<h2> <?php echo Yum::t('Activation did not work'); ?> </h2>
+<h1> <?php echo Yum::t('Activation did not work'); ?> </h1>
 
 <?php if($error == -1) echo Yum::t('The user is already activated'); ?>
 <?php if($error == -2) echo Yum::t('Wrong activation Key'); ?>
diff --git a/modules/registration/views/registration/activation_success.php b/modules/registration/views/registration/activation_success.php
index 6352cb7..6ddfb2f 100644
--- a/modules/registration/views/registration/activation_success.php
+++ b/modules/registration/views/registration/activation_success.php
@@ -1,4 +1,4 @@
-<h2> <?php echo Yum::t('Your account has been activated'); ?> </h2>
+<h1> <?php echo Yum::t('Your account has been activated'); ?> </h1>
 
 <p> <?php Yum::t('Click {here} to go to the login form', array(
 			'{here}' => CHtml::link(Yum::t('here'), Yum::module()->loginUrl
diff --git a/modules/registration/views/registration/recovery.php b/modules/registration/views/registration/recovery.php
index 9e85580..8fc2ee1 100644
--- a/modules/registration/views/registration/recovery.php
+++ b/modules/registration/views/registration/recovery.php
@@ -7,29 +7,27 @@
 
 ?>
 <?php if(Yum::hasFlash()) {
-echo '<div class="success">';
+echo '<div class="alert alert-success">';
 echo Yum::getFlash(); 
 echo '</div>';
 } else {
 echo '<h2>'.Yum::t('Password recovery').'</h2>';
 ?>
 
-<div class="form">
+
 <?php echo CHtml::beginForm(); ?>
 
 	<?php echo CHtml::errorSummary($form); ?>
 	
-	<div class="row">
+	
 		<?php echo CHtml::activeLabel($form,'login_or_email'); ?>
 		<?php echo CHtml::activeTextField($form,'login_or_email') ?>
 		<?php echo CHtml::error($form,'login_or_email'); ?>
 		<p class="hint"><?php echo Yum::t("Please enter your user name or email address."); ?></p>
-	</div>
 	
-	<div class="row submit">
-		<?php echo CHtml::submitButton(Yum::t('Restore')); ?>
-	</div>
+		<?php echo CHtml::submitButton(Yum::t('Restore'), array('class'=>'btn')); ?>
+	
 
 <?php echo CHtml::endForm(); ?>
-</div><!-- form -->
+
 <?php } ?>
diff --git a/modules/registration/views/registration/registration.php b/modules/registration/views/registration/registration.php
index 076216b..22d9af1 100644
--- a/modules/registration/views/registration/registration.php
+++ b/modules/registration/views/registration/registration.php
@@ -2,7 +2,6 @@
 
 <?php $this->breadcrumbs = array(Yum::t('Registration')); ?>
 
-<div class="form">
 <?php $activeform = $this->beginWidget('CActiveForm', array(
   'id'=>'registration-form',
   'enableAjaxValidation'=>true,
@@ -15,37 +14,37 @@
 <?php echo CHtml::errorSummary(array($form, $profile)); ?>
 
 <?php if(!Yum::module('registration')->registration_by_email) { ?>
-<div class="row">
+<div class="row-fluid">
   <div class="span12"> <?php
 echo $activeform->labelEx($form,'username');
 echo $activeform->textField($form,'username');
 ?> </div></div>
 <?php } ?>
 
-<div class="row">
+<div class="row-fluid">
 <div class="span12"> <?php
 echo $activeform->labelEx($profile,'email');
 echo $activeform->textField($profile,'email');
 ?> </div></div>
 
-  <div class="row"><div class="span12"> <?php
+  <div class="row-fluid"><div class="span12"> <?php
 echo $activeform->labelEx($profile,'firstname');
 echo $activeform->textField($profile,'firstname');
 ?> </div></div>
 
-  <div class="row"><div class="span12"> <?php
+  <div class="row-fluid"><div class="span12"> <?php
 echo $activeform->labelEx($profile,'lastname');
 echo $activeform->textField($profile,'lastname');
 ?> </div></div>
 
-<div class="row">
+<div class="row-fluid">
 <div class="span12">
 <?php echo $activeform->labelEx($form,'password'); ?>
 <?php echo $activeform->passwordField($form,'password'); ?>
 </div>
 </div>
 
-<div class="row">
+<div class="row-fluid">
 <div class="span12">
 <?php echo $activeform->labelEx($form,'verifyPassword'); ?>
 <?php echo $activeform->passwordField($form,'verifyPassword'); ?>
@@ -54,7 +53,7 @@
 <?php if(extension_loaded('gd')
 && !Yum::module()->debug
 && Yum::module('registration')->enableCaptcha): ?>
-  <div class="row">
+  <div class="row-fluid">
       <div class="span12">
     <?php echo CHtml::activeLabelEx($form,'verifyCode'); ?>
     <div>
@@ -67,11 +66,10 @@
   </div></div>
   <?php endif; ?>
 
-  <div class="row submit">
+  <div class="row-fluid submit">
     <div class="span12">
     <?php echo CHtml::submitButton(Yum::t('Registration'), array('class'=>'btn')); ?>
         </div>
   </div>
 
 <?php $this->endWidget(); ?>
-</div><!-- form -->
diff --git a/modules/user/views/user/login_debug.php b/modules/user/views/user/login_debug.php
index 2c0c785..50bed0c 100644
--- a/modules/user/views/user/login_debug.php
+++ b/modules/user/views/user/login_debug.php
@@ -101,9 +101,15 @@
 </div>
 
 <div class="row-fluid">
-<div class="span12">
+<div class="span3">
 <div class="buttons">
-<?php echo CHtml::submitButton(Yum::t('Login'), array('class' => 'btn')); ?>
+<p><?php echo CHtml::submitButton(Yum::t('Login'), array('class' => 'btn')); ?> </p>
+
+</div>
+
+<div class="alert alert-error">
+	Klick <?   echo CHtml::link(Yum::t("Registration"),
+    Yum::module('registration')->registrationUrl); ?> if you are not registered.
 </div>
 
 </div>