diff --git a/app/controllers/SessionController.php b/app/controllers/SessionController.php
index a4f638b..123a527 100644
--- a/app/controllers/SessionController.php
+++ b/app/controllers/SessionController.php
@@ -48,7 +48,7 @@ class SessionController extends \BaseController
 
 	public function doLogout()
 	{
-		Auth::logout();
+		\Auth::logout();
 		return \Redirect::to('/');
 	}
 
diff --git a/app/controllers/UserController.php b/app/controllers/UserController.php
index 8d7ef4d..e048e86 100644
--- a/app/controllers/UserController.php
+++ b/app/controllers/UserController.php
@@ -54,7 +54,7 @@ class UserController extends \BaseController
 	 */
 	public function chooseGroup()
 	{
-		return View::make('users.group')->with('id', array());
+		return View::make('users.group');
 	}
 
 	/**
diff --git a/app/database/migrations/2014_06_27_003343_create_user_xref_role_table.php b/app/database/migrations/2014_06_27_003343_create_user_xref_role_table.php
index 4eebe22..52a5bd9 100644
--- a/app/database/migrations/2014_06_27_003343_create_user_xref_role_table.php
+++ b/app/database/migrations/2014_06_27_003343_create_user_xref_role_table.php
@@ -15,8 +15,10 @@ class CreateUserXrefRoleTable extends Migration {
 		Schema::create('user_xref_role', function(Blueprint $table)
 		{
 			$table->increments('id');
-			$table->integer('user_id');
-			$table->integer('role_id');
+			$table->integer('user_id')->unsigned();
+			$table->foreign('user_id')->references('id')->on('users')->onUpdate('cascade');
+			$table->integer('role_id')->unsigned();
+			$table->foreign('role_id')->references('id')->on('roles')->onUpdate('cascade');
 			$table->timestamps();
 		});
 	}
diff --git a/app/routes.php b/app/routes.php
index 7f43155..ebb1f6c 100755
--- a/app/routes.php
+++ b/app/routes.php
@@ -31,11 +31,7 @@ Route::get('users/group', array('uses' => 'UserController@chooseGroup'));
 Route::get('users/{id}', array('uses' => 'UserController@viewProfile'));
 Route::post('users/{id}', array('uses' => 'UserController@updateProfile'));
 
-Route::get('choose', function(){ 
 
-	return View::make('mentors.group');
-
-});
 
 
 /**
diff --git a/app/views/users/complete.blade.php b/app/views/users/complete.blade.php
index 1ade172..63ab3b7 100644
--- a/app/views/users/complete.blade.php
+++ b/app/views/users/complete.blade.php
@@ -35,7 +35,7 @@
 
 		<div class="container padded">
 			<div class="container">
-				<legend><h2>Complete Your Profile</h2></legend>
+				<legend><h2>Complete Your Registration</h2></legend>
 			</div>
 		
 			<div class="row">
diff --git a/app/views/users/group.blade.php b/app/views/users/group.blade.php
index 4537233..c60cb37 100644
--- a/app/views/users/group.blade.php
+++ b/app/views/users/group.blade.php
@@ -34,7 +34,7 @@
 
 		<div class="container padded">
 			<div class="container">
-				<legend><h2>Complete Your Profile</h2></legend>
+				<legend><h2>Complete Your Registration</h2></legend>
 			</div>
 
 			<div class="row">
@@ -54,14 +54,14 @@
 					<div class="col-lg-6">
 						<div class="page-header"><h1>mentor -  <small>someone who teaches or gives help and advice to a less experienced and often younger person.(a friend of Odysseus entrusted with the education of Odysseus' son Telemachus)</small></h1></div>
 						<p id="button-row">
-							{{ HTML::link('mentors/create', 'Become a Mentor', array('class' => 'btn btn-large btn-primary proxima-bold')) }}
+							{{ HTML::linkRoute('users/create', 'Become a Mentor', array('class' => 'btn btn-large btn-primary proxima-bold')) }}
 						</p>
 					</div>
 
 					<div class="col-lg-6">
 						<div class="page-header"><h1>mentee - <small>a less experienced person (protege) who is offered special guidance and support by a respected and trusted person with more experience (a mentor)</small></h1></div>
 						<p id="button-row">
-							{{ HTML::link('mentees/create', 'Become a Mentee', array('class' => 'btn btn-large btn-primary proxima-bold')) }}	
+							{{ HTML::link('users/create', 'Become a Mentee', array('class' => 'btn btn-large btn-primary proxima-bold')) }}	
 						</p>
 					</div>
 				</div>