First start at retiring Affiliate in favour of RTM

application/views/account/user/edit.php

@@ -37,7 +37,7 @@
 	</tr>
 	<tr>
 		<td class="head">Title</td>
-		<td><?php echo $record->title('title'); ?></td>
+		<td><?php echo $record->display('title'); ?></td>
 	</tr>
 	<tr>
 		<td class="head">Address</td>
@@ -61,7 +61,7 @@
 	</tr>
 	<tr>
 		<td class="head">Country</td>
-		<td><?php echo $record->country('country'); ?></td>
+		<td><?php echo $record->country->display('name'); ?></td>
 	</tr>
 	<tr>
 		<td class="head">Language</td>
@@ -69,7 +69,7 @@
 	</tr>
 	<tr>
 		<td class="head">Currency</td>
-		<td><?php echo $record->currency('currency_id'); ?></td>
+		<td><?php echo $record->currency->display('name'); ?></td>
 	</tr>
 	<tr>
 		<!-- @todo NEEDS TO BE CONFIGURABLE -->

application/views/welcome/reseller.php

@@ -0,0 +1 @@
+Welcome, please select from the menu on the left.

application/views/welcome/user.php

@@ -0,0 +1 @@
+Welcome, please select from the menu on the left.