switch to form-group

44 files changed, 148 insertions, 148 deletions

diff --git a/templates/add_xref.tpl b/templates/add_xref.tpl
index fe19b78..db25dab 100644
--- a/templates/add_xref.tpl
+++ b/templates/add_xref.tpl
@@ -35,7 +35,7 @@ function updateContactXrefFormat() { {/literal}
 					{legend legend="XRef Contents"}
 						{formfeedback error=$errors warning=$contactWarnings success=$contactSuccess}
 						
-						<div class="row">
+						<div class="form-group">
 							{formlabel label="Reference Type" for="source"}
 							{forminput}
 								{html_options name="source" id="source" options=$xrefInfo.xref_type_list.list selected=$smarty.const.CONTACT_FORMAT_GENERIC onchange="updateContactXrefFormat();}
@@ -59,7 +59,7 @@ function updateContactXrefFormat() { {/literal}
 
 				{include file="bitpackage:contact/edit_xref_dates.tpl"}
 
-				<div class="row submit">
+				<div class="form-group submit">
 					<input type="submit" name="fCancel" value="{tr}Cancel{/tr}" />&nbsp;
 					<input type="submit" name="fAddXref" value="{tr}Save{/tr}" />
 				</div>
diff --git a/templates/add_xref_address.tpl b/templates/add_xref_address.tpl
index 45faee5..17b1862 100644
--- a/templates/add_xref_address.tpl
+++ b/templates/add_xref_address.tpl
@@ -16,7 +16,7 @@
 			{jstabs}
 				{jstab title="Address Details"}
 					{legend legend="Contents"}
-						<div class="row">
+						<div class="form-group">
 							{formlabel label="Address Type" for="source"}
 							{forminput}
 								{html_options name="$xrefInfo.xref_type_list[$xrefInfo.source]" options=$xrefInfo.xref_type_list selected=`$xrefInfo.source`}
@@ -24,7 +24,7 @@
 							{/forminput}
 						</div>
 		
-						<div class="row">
+						<div class="form-group">
 							{formlabel label="House Name/Number" for="xkey_ext"}
 							{forminput}
 								<input type="text" name="xkey_ext" id="xkey_ext" value="{$xrefInfo.xkey_ext|escape}" />
@@ -32,7 +32,7 @@
 							{/forminput}
 						</div>
 		
-						<div class="row">
+						<div class="form-group">
 							{formlabel label="Postcode" for="xkey"}
 							{forminput}
 								<input type="text" name="xkey" id="xkey" value="{$xrefInfo.xkey|escape}" />&nbsp;<input type="submit" name="fPostcode" value="{tr}Postcode Lookup{/tr}" />
@@ -50,7 +50,7 @@
 
 				{jstab title="Time period"}
 					{legend legend="Start and Stop Dates"}
-						<div class="row">
+						<div class="form-group">
 							<input type="hidden" name="startDateInput" value="1" />
 							&nbsp;Ignore Date <input type="checkbox" name="ignore_start_date" />
 							{formlabel label="Start Date" for=""}
@@ -61,7 +61,7 @@
 							{/forminput}
 						</div>
 		
-						<div class="row">
+						<div class="form-group">
 							<input type="hidden" name="endDateInput" value="1" />
 							&nbsp;Ignore Date <input type="checkbox" name="ignore_end_date" checked />
 							{formlabel label="End Date" for=""}
@@ -74,7 +74,7 @@
 					{/legend}
 				{/jstab}
 			
-				<div class="row submit">
+				<div class="form-group submit">
 					<input type="submit" name="fCancel" value="{tr}Cancel{/tr}" />&nbsp;
 					<input type="submit" name="fAddXref" value="{tr}Save{/tr}" />
 				</div>
diff --git a/templates/admin_contact.tpl b/templates/admin_contact.tpl
index c9361cb..bb2de40 100644
--- a/templates/admin_contact.tpl
+++ b/templates/admin_contact.tpl
@@ -3,7 +3,7 @@
 	<input type="hidden" name="page" value="{$page}" />
 
 	{foreach from=$formContactListFeatures key=item item=output}
-		<div class="row">
+		<div class="form-group">
 			{formlabel label=$output.label for=$item}
 			{forminput}
 				{html_checkboxes name="$item" values="y" checked=$gBitSystem->getConfig($item) labels=false id=$item}
@@ -12,7 +12,7 @@
 		</div>
 	{/foreach}
 
-		<div class="row">
+		<div class="form-group">
 			{formlabel label="Default Contact Types"}
 			{forminput}
 				{html_checkboxes name="defaultTypes" options=$contactTypeDefaults selected=$contactTypesSelected separator="<br />"}
@@ -20,7 +20,7 @@
 			{/forminput}
 		</div>
 
-	<div class="row submit">
+	<div class="form-group submit">
 		<input type="submit" name="contactlistfeatures" value="{tr}Change preferences{/tr}" />
 	</div>
 {/form}
diff --git a/templates/admin_contact_type.tpl b/templates/admin_contact_type.tpl
index 6611be2..cbcef19 100644
--- a/templates/admin_contact_type.tpl
+++ b/templates/admin_contact_type.tpl
@@ -14,7 +14,7 @@
 		{form legend="Create a new Topic" enctype="multipart/form-data"}
 			<input type="hidden" name="MAX_FILE_SIZE" value="1000000" />
 
-			<div class="control-group column-group gutters">
+			<div class="form-group">
 				{formlabel label="Contact Type Title" for="type_name"}
 				{forminput}
 					<input type="text" id="topic_name" name="type_name" />
@@ -22,8 +22,8 @@
 				{/forminput}
 			</div> 
 
-			<div class="control-group submit">
-				<input type="submit" class="ink-button" name="fSubmitAddType" value="{tr}Add Contact Type{/tr}" />
+			<div class="form-group submit">
+				<input type="submit" class="btn btn-default" name="fSubmitAddType" value="{tr}Add Contact Type{/tr}" />
 			</div>
 		{/form}
 
diff --git a/templates/admin_xref_types.tpl b/templates/admin_xref_types.tpl
index a3f597c..5b6c1e1 100644
--- a/templates/admin_xref_types.tpl
+++ b/templates/admin_xref_types.tpl
@@ -14,7 +14,7 @@
 		{form legend="Create a new Source Type" enctype="multipart/form-data"}
 			<input type="hidden" name="MAX_FILE_SIZE" value="1000000" />
 
-			<div class="control-group column-group gutters">
+			<div class="form-group">
 				{formlabel label="Source Type Title" for="cross_ref_title"}
 				{forminput}
 					<input type="text" id="cross_ref_title" name="cross_ref_title" />
@@ -22,7 +22,7 @@
 				{/forminput}
 			</div> 
 
-			<div class="control-group column-group gutters">
+			<div class="form-group">
 				{formlabel label="Source Template" for="topic_name"}
 				{forminput}
 					<input type="text" id="template" name="template" />
@@ -30,8 +30,8 @@
 				{/forminput}
 			</div> 
 
-			<div class="control-group submit">
-				<input type="submit" class="ink-button" name="fSubmitAddTopic" value="{tr}Add Topic{/tr}" />
+			<div class="form-group submit">
+				<input type="submit" class="btn btn-default" name="fSubmitAddTopic" value="{tr}Add Topic{/tr}" />
 			</div>
 		{/form}
 
diff --git a/templates/comments.tpl b/templates/comments.tpl
index eec66d8..d0b78fc 100644
--- a/templates/comments.tpl
+++ b/templates/comments.tpl
@@ -13,7 +13,7 @@
 			{include file="bitpackage:liberty/comments_display_option_bar.tpl"}
 
 			{if $comments_ajax && $gBitUser->hasPermission( 'p_liberty_post_comments' )}
-				<div class="row">
+				<div class="form-group">
 					<input type="submit" name="post_comment_request" value="{tr}Add Note{/tr}" onclick="LibertyComment.attachForm('comment_{$gContent->mContentId}', '{$gContent->mContentId}', {if $gContent->mContentId}{$gContent->mContentId}{elseif $commentsParentId}{$commentsParentId}{else}null{/if})"/>
 				</div>
 			{/if}
diff --git a/templates/comments_post_inc.tpl b/templates/comments_post_inc.tpl
index 69de357..1dcfa3f 100644
--- a/templates/comments_post_inc.tpl
+++ b/templates/comments_post_inc.tpl
@@ -24,7 +24,7 @@
 					<input type="hidden" name="no_js_preview" value="y" />
 				{/if}
 
-				<div class="row">
+				<div class="form-group">
 					{formlabel label="Title" for="comments-title"}
 					{forminput}
 						<input type="text" size="50" name="comment_title" id="comments-title" value="{$postComment.title|escape:html}" />
@@ -33,7 +33,7 @@
 				</div>
 
 				{if !$gBitUser->isRegistered()}
-					<div class="row" id="post-login">
+					<div class="form-group" id="post-login">
 						{formlabel label="Login" for="login-email"}
 						{forminput}
 							<div style="display:inline-block;padding-right:20px;">
@@ -47,7 +47,7 @@
 							<div class="formhelp">{tr}If you are already registered with <strong>{$gBitSystem->mConfig.site_title|default:"this site"}</strong> please enter your login details above.{/tr}</div>
 						{/forminput}
 					</div>
-					<div class="row" style="display:none" id="post-anon">
+					<div class="form-group" style="display:none" id="post-anon">
 						{formlabel label="Your Name" for="comments-name"}
 						{forminput}
 							<input type="text" size="50" name="comment_name" id="comments-name" value="{$postComment.anon_name|escape:html}" />
@@ -55,7 +55,7 @@
 						{/forminput}
 					</div>
 					{captcha variant="row" id="post-captcha" style="display:none"}
-					<div class="row">
+					<div class="form-group">
 						{forminput}
 							<input type="checkbox" name="anon_post" id="anon-post" value="y" onchange="BitBase.toggleElementDisplay('post-login','block');BitBase.toggleElementDisplay('post-anon','block');BitBase.toggleElementDisplay('post-captcha','block');" /> {tr}Anonymous Post{/tr}
 							{formhelp note=""}
@@ -76,7 +76,7 @@
 					{/if}
 				{/if}
 
-				<div class="row submit">
+				<div class="form-group submit">
 					<input type="submit" name="post_comment_preview" value="{tr}Preview{/tr}" {if $comments_ajax}onclick="LibertyComment.previewComment(); return false;"{/if}/>&nbsp;
 					<input type="submit" name="post_comment_submit" value="{tr}Post{/tr}" {if $comments_ajax}onclick="LibertyComment.postComment(); return false;"{/if}/>&nbsp;
 					<input type="submit" name="post_comment_cancel" value="{tr}Cancel{/tr}" {if $comments_ajax}onclick="LibertyComment.cancelComment(true); return false;"{/if}/>
diff --git a/templates/display_address.tpl b/templates/display_address.tpl
index e0ec3b9..37c1aff 100644
--- a/templates/display_address.tpl
+++ b/templates/display_address.tpl
@@ -1,4 +1,4 @@
-		<div class="row">
+		<div class="form-group">
 			{formlabel label="$header" for="lpi"}
 			{forminput}
 				{if isset($address.sao) && ($address.sao <> '') }
@@ -26,7 +26,7 @@
 			<div class="clear"></div>
 		</div>
 		{if $locate == 1 && isset($address.x_coordinate) && ($address.x_coordinate <> '') }
-		<div class="row">
+		<div class="form-group">
 			{formlabel label="Visual Centre Coordinates" for="street_start_x"}
 			{forminput}
 				Lat: {$address.y_coordinate|escape} Lon: {$address.x_coordinate|escape}
diff --git a/templates/display_contact.tpl b/templates/display_contact.tpl
index aac8215..ac4254f 100644
--- a/templates/display_contact.tpl
+++ b/templates/display_contact.tpl
@@ -1,7 +1,7 @@
 		{include file="bitpackage:contact/display_type_header.tpl"}
 
 		{if isset($pageInfo.usn) && ($pageInfo.usn <> '') }
-		<div class="row">
+		<div class="form-group">
 			{formlabel label="USN" for="usn"}
 			{forminput}
 				{$pageInfo.usn|escape} 
@@ -10,7 +10,7 @@
 		</div>
 		{/if}
 		{if isset($pageInfo.name) && ($pageInfo.name <> '') }
-		<div class="row">
+		<div class="form-group">
 			{formlabel label="Name" for="name"}
 			{forminput}
 				{$pageInfo.name|escape} 
@@ -19,7 +19,7 @@
 		</div>
 		{/if}
 		{if isset($pageInfo.organisation) && ($pageInfo.organisation <> '') }
-		<div class="row">
+		<div class="form-group">
 			{formlabel label="Organisation" for="organisation"}
 			{forminput}
 				{$pageInfo.organisation|escape} 
@@ -28,7 +28,7 @@
 		</div>
 		{/if}
 		{if isset($pageInfo.dob) && ($pageInfo.dob <> '') }
-		<div class="row">
+		<div class="form-group">
 			{formlabel label="Date of Birth" for="dob"}
 			{forminput}
 				{$pageInfo.dob|bit_long_date}
@@ -37,7 +37,7 @@
 		</div>
 		{/if}
 		{if isset($pageInfo.nino) && ($pageInfo.nino <> '') }
-		<div class="row">
+		<div class="form-group">
 			{formlabel label="National Insurance Number" for="nino"}
 			{forminput}
 				{$pageInfo.nino|escape}
@@ -56,7 +56,7 @@
 			</li>
 		{/section}
 
-		<div class="row">
+		<div class="form-group">
 			{formlabel label="General Notes" for="data"}
 			{forminput}
 				{$pageInfo.data}
diff --git a/templates/display_type_header.tpl b/templates/display_type_header.tpl
index fa79ba8..bdfe449 100644
--- a/templates/display_type_header.tpl
+++ b/templates/display_type_header.tpl
@@ -1,4 +1,4 @@
-<div class="row">
+<div class="form-group">
 	{formlabel label="Content Types" for=content_types}
 	{forminput}
 		{foreach from=$pageInfo.contact_types key=type_id item=type}
diff --git a/templates/edit.tpl b/templates/edit.tpl
index d933ed5..c89eb03 100644
--- a/templates/edit.tpl
+++ b/templates/edit.tpl
@@ -35,7 +35,7 @@
 					{legend legend="$editLabel Details"}
 						<input type="hidden" name="content_id" value="{$pageInfo.content_id}" />
 						
-						<div class="row">
+						<div class="form-group">
 							{formfeedback warning=$errors.names}
 							{formfeedback warning=$errors.store}
 
@@ -55,28 +55,28 @@
 						{include file="bitpackage:contact/edit_type_header.tpl"}
 							
 						{if $pageInfo.name or $pageInfo.contact_types.0.content_id or !isset( $pageInfo.contact_types ) }
-							<div class="row">
+							<div class="form-group">
 								{formlabel label="Title" for="prefix"}
 								{forminput}
 									<input size="60" type="text" name="prefix" id="prefix" value="{$pageInfo.prefix|escape}" />
 								{/forminput}
 								<div class="clear"></div>
 							</div>
-							<div class="row">
+							<div class="form-group">
 								{formlabel label="Forename" for="forename"}
 								{forminput}
 									<input size="60" type="text" name="forename" id="forename" value="{$pageInfo.forename|escape}" />
 								{/forminput}
 								<div class="clear"></div>
 							</div>
-							<div class="row">
+							<div class="form-group">
 								{formlabel label="Surname" for="surname"}
 								{forminput}
 									<input size="60" type="text" name="surname" id="surname" value="{$pageInfo.surname|escape}" />
 								{/forminput}
 								<div class="clear"></div>
 							</div>
-							<div class="row">
+							<div class="form-group">
 								{formlabel label="Suffix" for="suffix"}
 								{forminput}
 									<input size="60" type="text" name="suffix" id="suffix" value="{$pageInfo.suffix|escape}" />
@@ -85,7 +85,7 @@
 							</div>
 						{/if}
 						{if $pageInfo.organisation or $pageInfo.contact_types.1.content_id or !isset( $pageInfo.contact_types ) }
-							<div class="row">
+							<div class="form-group">
 								{formlabel label="Organisation" for="organisation"}
 								{forminput}
 									<input size="60" type="text" name="organisation" id="organisation" value="{$pageInfo.organisation|escape}" />
@@ -95,7 +95,7 @@
 						{/if}
 {* include edit_personal.tpl *}
 
-						<div class="row">
+						<div class="form-group">
 							{formlabel label="Key Number" for="xkey"}
 							{forminput}
 								<input size="10" type="text" name="xkey" id="xkey" value="{$pageInfo.xkey|escape}" />
@@ -103,7 +103,7 @@
 							<div class="clear"></div>
 						</div>
 
-						<div class="row">
+						<div class="form-group">
 							{formlabel label="Note" for="description"}
 							{forminput}
 								<input size="60" type="text" name="description" id="description" value="{$pageInfo.description|escape}" />
@@ -115,12 +115,12 @@
 
 				{jstab title="Contact Notes"}
 					{legend legend="Notes Body"}
-						<div class="row">
+						<div class="form-group">
 							{textarea rows=30 noformat=1 edit=$pageInfo.edit}
 						</div>
 
 						{if $page ne 'SandBox'}
-							<div class="row">
+							<div class="form-group">
 								{formlabel label="Comment" for="comment"}
 								{forminput}
 									<input size="50" type="text" name="comment" id="comment" value="{$pageInfo.comment}" />
@@ -143,7 +143,7 @@
 				{/jstab}
 			{/jstabs}
 
-			<div class="row submit">
+			<div class="form-group submit">
 				<input type="submit" name="fCancel" value="{tr}Cancel{/tr}" />&nbsp;
 				<input type="submit" name="fSaveContact" value="{tr}Save{/tr}" />
 			</div>
diff --git a/templates/edit_contact.tpl b/templates/edit_contact.tpl
index 53ac74f..93226a0 100644
--- a/templates/edit_contact.tpl
+++ b/templates/edit_contact.tpl
@@ -37,42 +37,42 @@
 
 			{include file="bitpackage:contact/edit_type_header.tpl"}
 
-{*			<div class="row">
+{*			<div class="form-group">
 				{formlabel label="Title" for="title"}
 				{forminput}
 					<input size="60" type="text" name="prefix" id="prefix" value="{$pageInfo.prefix|escape}" />
 				{/forminput}
 				<div class="clear"></div>
 			</div>
-			<div class="row">
+			<div class="form-group">
 				{formlabel label="Forename" for="forename"}
 				{forminput}
 					<input size="60" type="text" name="forename" id="forename" value="{$pageInfo.forename|escape}" />
 				{/forminput}
 				<div class="clear"></div>
 			</div>
-			<div class="row">
+			<div class="form-group">
 				{formlabel label="Surname" for="surname"}
 				{forminput}
 					<input size="60" type="text" name="surname" id="surname" value="{$pageInfo.surname|escape}" />
 				{/forminput}
 				<div class="clear"></div>
 			</div>
-			<div class="row">
+			<div class="form-group">
 				{formlabel label="Suffix" for="suffix"}
 				{forminput}
 					<input size="60" type="text" name="suffix" id="suffix" value="{$pageInfo.suffix|escape}" />
 				{/forminput}
 				<div class="clear"></div>
 			</div>
-			<div class="row">
+			<div class="form-group">
 				{formlabel label="Organisation" for="organisation"}
 				{forminput}
 					<input size="60" type="text" name="organisation" id="organisation" value="{$pageInfo.organisation|escape}" />
 				{/forminput}
 				<div class="clear"></div>
 			</div>
-			<div class="row">
+			<div class="form-group">
 				{formlabel label="NI Number" for="nino"}
 				{forminput}
 					<input size="10" type="text" name="nino" id="nino" value="{$pageInfo.nino|escape}" />
@@ -80,14 +80,14 @@
 				<div class="clear"></div>
 			</div>
 *}
-			<div class="row">
+			<div class="form-group">
 				{formlabel label="Note" for="description"}
 				{forminput}
 					<input size="60" type="text" name="description" id="description" value="{$pageInfo.description|escape}" />
 				{/forminput}
 				<div class="clear"></div>
 			</div>
-			<div class="row">
+			<div class="form-group">
 				{formlabel label="Memo" for="$textarea_id"}
 				{forminput}
 					<input type="hidden" name="rows" value="{$rows}" />
@@ -97,7 +97,7 @@
 				<div class="clear"></div>
 			</div>
 
-			<div class="row submit">
+			<div class="form-group submit">
 				<input type="submit" name="preview" value="{tr}Preview{/tr}" /> 
 				<input type="submit" name="fSavePage" value="{tr}Save{/tr}" />&nbsp;
 				<input type="submit" name="cancel" value="{tr}Cancel{/tr}" />
diff --git a/templates/edit_key_break.tpl b/templates/edit_key_break.tpl
index 8ee1f50..959ceac 100644
--- a/templates/edit_key_break.tpl
+++ b/templates/edit_key_break.tpl
@@ -14,7 +14,7 @@
 			<input type="hidden" name="xref_id" value="{$xrefInfo.xref_id}" />
 
 			{legend legend="Break Seal Contents"}
-				<div class="row">
+				<div class="form-group">
 					{formlabel label="Seal Break Job Reference" for="xref"}
 					{forminput}
 						<input type="text" name="xref" id="xref" value="{$xrefInfo.xref|escape}" />
@@ -23,7 +23,7 @@
 					<div class="clear"></div>
 				</div>
 
-				<div class="row">
+				<div class="form-group">
 					{formlabel label="Reference Key" for="xkey"}
 					{forminput}
 						<input type="text" name="xkey" id="xkey" value="{$xrefInfo.xkey|escape}" />
@@ -32,7 +32,7 @@
 					<div class="clear"></div>
 				</div>
 
-				<div class="row">
+				<div class="form-group">
 					{formlabel label="Reference Text" for="xkey_ext"}
 					{forminput}
 						<input type="text" name="xkey_ext" id="xkey_ext" value="{$xrefInfo.xkey_ext|escape}" />
@@ -47,7 +47,7 @@
 				{/capture}
 				{textarea rows=5 noformat=1 edit=$xrefInfo.data}
 			{/legend}
-				<div class="row submit">
+				<div class="form-group submit">
 					<input type="submit" name="fCancel" value="{tr}Cancel{/tr}" />&nbsp;
 					<input type="submit" name="fSaveXref" value="{tr}Save{/tr}" />
 				</div>
diff --git a/templates/edit_personal.tpl b/templates/edit_personal.tpl
index 488d59d..19dd8fb 100644
--- a/templates/edit_personal.tpl
+++ b/templates/edit_personal.tpl
@@ -1,22 +1,22 @@
-<div class="row">
+<div class="form-group">
 	{formlabel label="NI Number" for="nino"}
 	{forminput}
 		<input size="10" type="text" name="nino" id="nino" value="{$pageInfo.nino|escape}" />
 	{/forminput}
 </div>
-<div class="row">
+<div class="form-group">
 	{formlabel label="Date of Birth" for="dob"}
 	{forminput}
 		<input size="10" type="text" name="dob" id="dob" value="{$pageInfo.dob|escape}" />
 	{/forminput}
 </div>
-<div class="row">
+<div class="form-group">
 	{formlabel label="Date of eighteen" for="eighteenth"}
 	{forminput}
 		<input size="10" type="text" name="eighteenth" id="eighteenth" value="{$pageInfo.eighteenth|escape}" />
 	{/forminput}
 </div>
-<div class="row">
+<div class="form-group">
 	{formlabel label="Date of Death" for="dod"}
 	{forminput}
 		<input size="10" type="text" name="dod" id="dod" value="{$pageInfo.dod|escape}" />
diff --git a/templates/edit_type_header.tpl b/templates/edit_type_header.tpl
index 7fcf73a..c37c4b8 100644
--- a/templates/edit_type_header.tpl
+++ b/templates/edit_type_header.tpl
@@ -1,4 +1,4 @@
-<div class="row">
+<div class="form-group">
 	{formlabel label="Content Types" for=content_types}
 	{forminput}
 		{if isset( $pageInfo.contact_types ) }
diff --git a/templates/edit_xref.tpl b/templates/edit_xref.tpl
index 1d7a8a9..92da394 100644
--- a/templates/edit_xref.tpl
+++ b/templates/edit_xref.tpl
@@ -16,7 +16,7 @@
 			{jstabs}
 				{jstab title="Reference Details"}
 					{legend legend="XRef Contents"}
-						<div class="row">
+						<div class="form-group">
 							{formlabel label="Cross Reference Link" for="xref"}
 							{forminput}
 								<input type="text" name="xref" id="xref" value="{$xrefInfo.xref|escape}" />
@@ -25,7 +25,7 @@
 							<div class="clear"></div>
 						</div>
 		
-						<div class="row">
+						<div class="form-group">
 							{formlabel label="Reference Key" for="xkey"}
 							{forminput}
 								<input type="text" name="xkey" id="xkey" value="{$xrefInfo.xkey|escape}" />
@@ -34,7 +34,7 @@
 							<div class="clear"></div>
 						</div>
 		
-						<div class="row">
+						<div class="form-group">
 							{formlabel label="Reference Text" for="xkey_ext"}
 							{forminput}
 								<input type="text" name="xkey_ext" id="xkey_ext" value="{$xrefInfo.xkey_ext|escape}" />
@@ -53,7 +53,7 @@
 
 				{jstab title="Time period"}
 					{legend legend="Start and Stop Dates"}
-						<div class="row">
+						<div class="form-group">
 							<input type="hidden" name="startDateInput" value="1" />
 							&nbsp;Ignore Date <input type="checkbox" name="ignore_start_date" {if $xrefInfo.ignore_start_date eq "y"}checked{/if} />
 							{formlabel label="Start Date" for=""}
@@ -65,7 +65,7 @@
 							<div class="clear"></div>
 						</div>
 		
-						<div class="row">
+						<div class="form-group">
 							<input type="hidden" name="endDateInput" value="1" />
 							&nbsp;Ignore Date <input type="checkbox" name="ignore_end_date" {if $xrefInfo.ignore_end_date eq "y"}checked{/if} />
 							{formlabel label="End Date" for=""}
@@ -79,7 +79,7 @@
 					{/legend}
 				{/jstab}
 			
-				<div class="row submit">
+				<div class="form-group submit">
 					<input type="submit" name="fCancel" value="{tr}Cancel{/tr}" />&nbsp;
 					<input type="submit" name="fSaveXref" value="{tr}Save{/tr}" />
 				</div>
diff --git a/templates/edit_xref_address.tpl b/templates/edit_xref_address.tpl
index c8386c0..6153fc0 100644
--- a/templates/edit_xref_address.tpl
+++ b/templates/edit_xref_address.tpl
@@ -27,7 +27,7 @@
 				{/jstab}
 				{include file="bitpackage:contact/edit_xref_dates.tpl"}
 			
-				<div class="row submit">
+				<div class="form-group submit">
 					<input type="submit" name="fCancel" value="{tr}Cancel{/tr}" />&nbsp;
 					<input type="submit" name="fSaveXref" value="{tr}Save{/tr}" />
 				</div>
diff --git a/templates/edit_xref_address_fields.tpl b/templates/edit_xref_address_fields.tpl
index 38f1b21..284be64 100644
--- a/templates/edit_xref_address_fields.tpl
+++ b/templates/edit_xref_address_fields.tpl
@@ -1,5 +1,5 @@
 {strip}
-<div class="row">
+<div class="form-group">
 	{formlabel label="House Name/Number" for="`$output`xkey_ext"}
 	{forminput}
 		<input type="text" name="{$output}xkey_ext" id="xkey_ext" value="{$xrefInfo.xkey_ext|escape}" />
@@ -8,7 +8,7 @@
 	<div class="clear"></div>
 </div>
 
-<div class="row">
+<div class="form-group">
 	{formlabel label="Postcode" for="`$output`xkey"}
 	{forminput}
 		<input type="text" name="{$output}xkey" id="xkey" value="{$xrefInfo.xkey|escape}" />&nbsp;<input type="submit" name="fPostcode" value="{tr}Postcode Lookup{/tr}" />
diff --git a/templates/edit_xref_contact.tpl b/templates/edit_xref_contact.tpl
index 6f54df5..8b10506 100644
--- a/templates/edit_xref_contact.tpl
+++ b/templates/edit_xref_contact.tpl
@@ -28,7 +28,7 @@
 
 				{include file="bitpackage:contact/edit_xref_dates.tpl"}
 			
-				<div class="row submit">
+				<div class="form-group submit">
 					<input type="submit" name="fCancel" value="{tr}Cancel{/tr}" />&nbsp;
 					<input type="submit" name="fSaveXref" value="{tr}Save{/tr}" />
 				</div>
diff --git a/templates/edit_xref_contact_fields.tpl b/templates/edit_xref_contact_fields.tpl
index c008458..11b18d4 100644
--- a/templates/edit_xref_contact_fields.tpl
+++ b/templates/edit_xref_contact_fields.tpl
@@ -1,5 +1,5 @@
 {strip}
-<div class="row">
+<div class="form-group">
 	{formlabel label="`$xrefInfo.template_title` Phone Number" for="`$output`xkey"}
 	{forminput}
 		<input type="text" name="{$output}xkey" id="xkey" value="{$xrefInfo.xkey|escape}" />
@@ -8,7 +8,7 @@
 	<div class="clear"></div>
 </div>
 
-<div class="row">
+<div class="form-group">
 	{formlabel label="`$xrefInfo.template_title` Name" for="`$output`xkey_ext"}
 	{forminput}
 		<input type="text" name="{$output}xkey_ext" id="xkey_ext" value="{$xrefInfo.xkey_ext|escape}" />
diff --git a/templates/edit_xref_dates.tpl b/templates/edit_xref_dates.tpl
index 56b7d04..fb58492 100644
--- a/templates/edit_xref_dates.tpl
+++ b/templates/edit_xref_dates.tpl
@@ -1,7 +1,7 @@
 {strip}
 {jstab title="Time period"}
 	{legend legend="Start and Stop Dates"}
-		<div class="row">
+		<div class="form-group">
 			<input type="hidden" name="startDateInput" value="1" />
 			&nbsp;Ignore Date <input type="checkbox" name="ignore_start_date" {if $xrefInfo.ignore_start_date eq "y"}checked{/if} />
 			{formlabel label="Start Date" for=""}
@@ -13,7 +13,7 @@
 			<div class="clear"></div>
 		</div>
 
-		<div class="row">
+		<div class="form-group">
 			<input type="hidden" name="endDateInput" value="1" />
 			&nbsp;Ignore Date <input type="checkbox" name="ignore_end_date" {if $xrefInfo.ignore_end_date eq "y"}checked{/if} />
 			{formlabel label="End Date" for=""}
diff --git a/templates/edit_xref_generic_fields.tpl b/templates/edit_xref_generic_fields.tpl
index 6134eff..5882d41 100644
--- a/templates/edit_xref_generic_fields.tpl
+++ b/templates/edit_xref_generic_fields.tpl
@@ -1,5 +1,5 @@
 {strip}
-<div class="row">
+<div class="form-group">
 	{formlabel label="Cross Reference Link" for="xref"}
 	{forminput}
 		<input type="text" name="xref" id="xref" value="{$xrefInfo.xref|escape}" />
@@ -7,7 +7,7 @@
 	{/forminput}
 	<div class="clear"></div>
 </div>
-<div class="row">
+<div class="form-group">
 	{formlabel label="Reference Key" for="xkey"}
 	{forminput}
 		<input type="text" name="xkey" id="xkey" value="{$xrefInfo.xkey|escape}" />
@@ -15,7 +15,7 @@
 	{/forminput}
 	<div class="clear"></div>
 </div>
-<div class="row">
+<div class="form-group">
 	{formlabel label="Reference Text" for="xkey_ext"}
 	{forminput}
 		<input type="text" name="xkey_ext" id="xkey_ext" value="{$xrefInfo.xkey_ext|escape}" />
diff --git a/templates/edit_xref_key_seal.tpl b/templates/edit_xref_key_seal.tpl
index 88981e2..7452ec7 100644
--- a/templates/edit_xref_key_seal.tpl
+++ b/templates/edit_xref_key_seal.tpl
@@ -16,7 +16,7 @@
 			{jstabs}
 				{jstab title="Key Seal Details"}
 					{legend legend="Contents"}
-						<div class="row">
+						<div class="form-group">
 							{formlabel label="Key Seal Code" for="xkey"}
 							{forminput}
 								<input type="text" name="xkey" id="xkey" value="{$xrefInfo.xkey|escape}" />
@@ -25,7 +25,7 @@
 						<div class="clear"></div>
 						</div>
 		
-						<div class="row">
+						<div class="form-group">
 							{formlabel label="Contract Number" for="xkey_ext"}
 							{forminput}
 								<input type="text" name="xkey_ext" id="xkey_ext" value="{$xrefInfo.xkey_ext|escape}" />
@@ -44,7 +44,7 @@
 
 				{jstab title="Time period"}
 					{legend legend="Start and Stop Dates"}
-						<div class="row">
+						<div class="form-group">
 							<input type="hidden" name="startDateInput" value="1" />
 							&nbsp;Ignore Date <input type="checkbox" name="ignore_start_date" {if $xrefInfo.ignore_start_date eq "y"}checked{/if} />
 							{formlabel label="Start Date" for=""}
@@ -56,7 +56,7 @@
 							<div class="clear"></div>
 						</div>
 		
-						<div class="row">
+						<div class="form-group">
 							<input type="hidden" name="endDateInput" value="1" />
 							&nbsp;Ignore Date <input type="checkbox" name="ignore_end_date" {if $xrefInfo.ignore_end_date eq "y"}checked{/if} />
 							{formlabel label="End Date" for=""}
@@ -70,7 +70,7 @@
 					{/legend}
 				{/jstab}
 			
-				<div class="row submit">
+				<div class="form-group submit">
 					<input type="submit" name="fCancel" value="{tr}Cancel{/tr}" />&nbsp;
 					<input type="submit" name="fSaveXref" value="{tr}Save{/tr}" />
 				</div>
diff --git a/templates/edit_xref_key_seal_fields.tpl b/templates/edit_xref_key_seal_fields.tpl
index d3ae05f..75f805d 100644
--- a/templates/edit_xref_key_seal_fields.tpl
+++ b/templates/edit_xref_key_seal_fields.tpl
@@ -1,5 +1,5 @@
 {strip}
-<div class="row">
+<div class="form-group">
 	{formlabel label="Key Seal Code" for="`$output`xkey"}
 	{forminput}
 		<input type="text" name="{$output}xkey" id="xkey" value="{$xrefInfo.xkey|escape}" />
@@ -8,7 +8,7 @@
 	<div class="clear"></div>
 </div>
 
-<div class="row">
+<div class="form-group">
 	{formlabel label="Contract Number" for="`$output`xkey_ext"}
 	{forminput}
 		<input type="text" name="{$output}xkey_ext" id="xkey_ext" value="{$xrefInfo.xkey_ext|escape}" />
diff --git a/templates/edit_xref_locate.tpl b/templates/edit_xref_locate.tpl
index 4810e4e..55795b1 100644
--- a/templates/edit_xref_locate.tpl
+++ b/templates/edit_xref_locate.tpl
@@ -16,7 +16,7 @@
 			{jstabs}
 				{jstab title="Location Details"}
 					{legend legend="Contents"}
-						<div class="row">
+						<div class="form-group">
 							{formlabel label="Geographic Location" for="xref"}
 							{forminput}
 								<a class="item" href="http://www.openstreetmap.org/?mlat={$xrefInfo.xkey_ext}&mlon={$xrefInfo.xkey}&zoom=17&layers=MN" target="_blank">{tr}OpenStreetMap Link{/tr}</a>
@@ -25,7 +25,7 @@
 							<div class="clear"></div>
 						</div>
 
-						<div class="row">
+						<div class="form-group">
 							{formlabel label="Easting/Longitude" for="xkey"}
 							{forminput}
 								<input type="text" name="xkey" id="xkey" value="{$xrefInfo.xkey|escape}" />
@@ -34,7 +34,7 @@
 							<div class="clear"></div>
 						</div>
 		
-						<div class="row">
+						<div class="form-group">
 							{formlabel label="Northing/Latitude" for="xkey_ext"}
 							{forminput}
 								<input type="text" name="xkey_ext" id="xkey_ext" value="{$xrefInfo.xkey_ext|escape}" />
@@ -53,7 +53,7 @@
 
 				{jstab title="Time period"}
 					{legend legend="Start and Stop Dates"}
-						<div class="row">
+						<div class="form-group">
 							<input type="hidden" name="startDateInput" value="1" />
 							&nbsp;Ignore Date <input type="checkbox" name="ignore_start_date" {if $xrefInfo.ignore_start_date eq "y"}checked{/if} />
 							{formlabel label="Start Date" for=""}
@@ -65,7 +65,7 @@
 							<div class="clear"></div>
 						</div>
 		
-						<div class="row">
+						<div class="form-group">
 							<input type="hidden" name="endDateInput" value="1" />
 							&nbsp;Ignore Date <input type="checkbox" name="ignore_end_date" {if $xrefInfo.ignore_end_date eq "y"}checked{/if} />
 							{formlabel label="End Date" for=""}
@@ -79,7 +79,7 @@
 					{/legend}
 				{/jstab}
 			
-				<div class="row submit">
+				<div class="form-group submit">
 					<input type="submit" name="fCancel" value="{tr}Cancel{/tr}" />&nbsp;
 					<input type="submit" name="fSaveXref" value="{tr}Save{/tr}" />
 				</div>
diff --git a/templates/edit_xref_locate_fields.tpl b/templates/edit_xref_locate_fields.tpl
index a3ea922..f63229f 100644
--- a/templates/edit_xref_locate_fields.tpl
+++ b/templates/edit_xref_locate_fields.tpl
@@ -1,5 +1,5 @@
 {strip}
-<div class="row">
+<div class="form-group">
 	{formlabel label="Geographic Location" for="`$output`xref"}
 	{forminput}
 		<a class="item" href="http://www.openstreetmap.org/?mlat={$xrefInfo.xkey_ext}&mlon={$xrefInfo.xkey}&zoom=17&layers=MN" target="_blank">{tr}OpenStreetMap Link{/tr}</a>
@@ -8,7 +8,7 @@
 	<div class="clear"></div>
 </div>
 
-<div class="row">
+<div class="form-group">
 	{formlabel label="Easting/Longitude" for="`$output`xkey"}
 	{forminput}
 		<input type="text" name="{$output}xkey" id="xkey" value="{$xrefInfo.xkey|escape}" />
@@ -17,7 +17,7 @@
 	<div class="clear"></div>
 </div>
 
-<div class="row">
+<div class="form-group">
 	{formlabel label="Northing/Latitude" for="`$output`xkey_ext"}
 	{forminput}
 		<input type="text" name="{$output}xkey_ext" id="xkey_ext" value="{$xrefInfo.xkey_ext|escape}" />
diff --git a/templates/edit_xref_phone.tpl b/templates/edit_xref_phone.tpl
index 2741fd0..77a7b3a 100644
--- a/templates/edit_xref_phone.tpl
+++ b/templates/edit_xref_phone.tpl
@@ -28,7 +28,7 @@
 
 				{include file="bitpackage:contact/edit_xref_dates.tpl"}
 			
-				<div class="row submit">
+				<div class="form-group submit">
 					<input type="submit" name="fCancel" value="{tr}Cancel{/tr}" />&nbsp;
 					<input type="submit" name="fSaveXref" value="{tr}Save{/tr}" />
 				</div>
diff --git a/templates/edit_xref_phone_fields.tpl b/templates/edit_xref_phone_fields.tpl
index aa76914..d77f487 100644
--- a/templates/edit_xref_phone_fields.tpl
+++ b/templates/edit_xref_phone_fields.tpl
@@ -1,5 +1,5 @@
 {strip}
-<div class="row">
+<div class="form-group">
 	{formlabel label="`$xrefInfo.template_title` Number" for="`$output`xkey"}
 	{forminput}
 		<input type="text" name="{$output}xkey" id="xkey" value="{$xrefInfo.xkey|escape}" />
diff --git a/templates/edit_xref_text.tpl b/templates/edit_xref_text.tpl
index f2b7c4c..41ebfb5 100644
--- a/templates/edit_xref_text.tpl
+++ b/templates/edit_xref_text.tpl
@@ -16,7 +16,7 @@
 			{jstabs}
 				{jstab title="Details"}
 					{legend legend="Contents"}
-						<div class="row">
+						<div class="form-group">
 							{formlabel label="`$xrefInfo.template_title` Number" for="xkey_ext"}
 							{forminput}
 								<input type="text" name="xkey_ext" id="xkey_ext" value="{$xrefInfo.xkey_ext|escape}" />
@@ -35,7 +35,7 @@
 
 				{jstab title="Time period"}
 					{legend legend="Start and Stop Dates"}
-						<div class="row">
+						<div class="form-group">
 							<input type="hidden" name="startDateInput" value="1" />
 							&nbsp;Ignore Date <input type="checkbox" name="ignore_start_date" {if $xrefInfo.ignore_start_date eq "y"}checked{/if} />
 							{formlabel label="Start Date" for=""}
@@ -47,7 +47,7 @@
 							<div class="clear"></div>
 						</div>
 		
-						<div class="row">
+						<div class="form-group">
 							<input type="hidden" name="endDateInput" value="1" />
 							&nbsp;Ignore Date <input type="checkbox" name="ignore_end_date" {if $xrefInfo.ignore_end_date eq "y"}checked{/if} />
 							{formlabel label="End Date" for=""}
@@ -61,7 +61,7 @@
 					{/legend}
 				{/jstab}
 			
-				<div class="row submit">
+				<div class="form-group submit">
 					<input type="submit" name="fCancel" value="{tr}Cancel{/tr}" />&nbsp;
 					<input type="submit" name="fSaveXref" value="{tr}Save{/tr}" />
 				</div>
diff --git a/templates/edit_xref_text_fields.tpl b/templates/edit_xref_text_fields.tpl
index 587e64e..be049ba 100644
--- a/templates/edit_xref_text_fields.tpl
+++ b/templates/edit_xref_text_fields.tpl
@@ -1,5 +1,5 @@
 {strip}
-<div class="row">
+<div class="form-group">
 	{formlabel label="`$xrefInfo.template_title` Text" for="`$output`xkey_ext"}
 	{forminput}
 		<input type="text" name="{$output}xkey_ext" id="xkey_ext" value="{$xrefInfo.xkey_ext|escape}" />
diff --git a/templates/edit_xref_type.tpl b/templates/edit_xref_type.tpl
index e69c532..6545e40 100644
--- a/templates/edit_xref_type.tpl
+++ b/templates/edit_xref_type.tpl
@@ -14,7 +14,7 @@
 
 			{formfeedback success=$gContent->mSuccess error=$gContent->mErrors}
 
-			<div class="row">
+			<div class="form-group">
 				{formlabel label="Topic Name" for="topic_name"}
 				{forminput}
 					<input type="text" id="topic_name" name="topic_name" value="{$gContent->mInfo.topic_name}" />
@@ -23,7 +23,7 @@
 				<div class="clear"></div>
 			</div>
 
-			<div class="row">
+			<div class="form-group">
 				{formlabel label="Topic Enabled" for="topic_enabled"}
 				{forminput}
 					<input type="checkbox" id="topic_enabled" name="active_topic" {if $gContent->mInfo.active_topic == 'y'}checked="checked"{/if} />
@@ -32,7 +32,7 @@
 				<div class="clear"></div>
 			</div>
 
-			<div class="row">
+			<div class="form-group">
 				{formlabel label="Upload Image" for="t-image"}
 				{forminput}
 					<input name="upload" id="t-image" type="file" />
@@ -41,7 +41,7 @@
 				<div class="clear"></div>
 			</div>
 
-			<div class="row">
+			<div class="form-group">
 				{formlabel label="Current Image"}
 				{forminput}
 					{if $gContent->mInfo.has_topic_image eq 'y'}
@@ -54,7 +54,7 @@
 				{/forminput}
 			</div>
 
-			<div class="row submit">
+			<div class="form-group submit">
 				<input type="submit" name="fSubmitSaveTopic" value="{tr}Update Topic{/tr}" />
 			</div>
 		{/form}
diff --git a/templates/edit_xref_value.tpl b/templates/edit_xref_value.tpl
index 2bd0d8c..0ae58d6 100644
--- a/templates/edit_xref_value.tpl
+++ b/templates/edit_xref_value.tpl
@@ -26,7 +26,7 @@
 					{/legend}
 				{/jstab}
 				{include file="bitpackage:contact/edit_xref_dates.tpl"}			
-				<div class="row submit">
+				<div class="form-group submit">
 					<input type="submit" name="fCancel" value="{tr}Cancel{/tr}" />&nbsp;
 					<input type="submit" name="fSaveXref" value="{tr}Save{/tr}" />
 				</div>
diff --git a/templates/edit_xref_value_fields.tpl b/templates/edit_xref_value_fields.tpl
index 3ae02aa..2231b61 100644
--- a/templates/edit_xref_value_fields.tpl
+++ b/templates/edit_xref_value_fields.tpl
@@ -1,5 +1,5 @@
 {strip}
-<div class="row">
+<div class="form-group">
 	{formlabel label="`$xrefInfo.template_title` Value" for="`$output`xkey_ext"}
 	{forminput}
 		<input type="text" name="{$output}xkey_ext" id="xkey_ext" value="{$xrefInfo.xkey_ext|escape}" />
diff --git a/templates/list_contact_type.tpl b/templates/list_contact_type.tpl
index 94e6b44..1f82582 100644
--- a/templates/list_contact_type.tpl
+++ b/templates/list_contact_type.tpl
@@ -1,5 +1,5 @@
 {if isset( $pageInfo.xref_type ) }
-		<div class="row">
+		<div class="form-group">
 			<table>
 				<thead>
 					<tr>
diff --git a/templates/list_ticket.tpl b/templates/list_ticket.tpl
index 6cd84df..a52176f 100644
--- a/templates/list_ticket.tpl
+++ b/templates/list_ticket.tpl
@@ -3,7 +3,7 @@
 		{assign var=ticketscnt value=$pageInfo.tickets|@count}
 		{jstab title="Ticket History ($ticketscnt)"}
 		{legend legend="Ticket History"}
-		<div class="row">
+		<div class="form-group">
 			{formlabel label="Tickets" for="ticket"}
 			{forminput}
 			<table>
diff --git a/templates/list_xref.tpl b/templates/list_xref.tpl
index 4ea4e43..6f819ba 100644
--- a/templates/list_xref.tpl
+++ b/templates/list_xref.tpl
@@ -2,7 +2,7 @@
 		{assign var=xrefcnt value=$pageInfo.xref|@count}
 		{jstab title="Cross reference ($xrefcnt)"}
 		{legend legend="Information References"}
-		<div class="row">
+		<div class="form-group">
 			{formlabel label="Cross reference" for="xref"}
 			{forminput}
 			<table>
diff --git a/templates/list_xref_generic.tpl b/templates/list_xref_generic.tpl
index 206a5e4..0602f8b 100644
--- a/templates/list_xref_generic.tpl
+++ b/templates/list_xref_generic.tpl
@@ -2,7 +2,7 @@
 		{assign var=xrefcnt value=$pageInfo.$source|@count}
 		{jstab title="$source_title ($xrefcnt)"}
 		{legend legend=$source_title}
-		<div class="row">
+		<div class="form-group">
 			<table>
 				<thead>
 					<tr>
diff --git a/templates/view_xref.tpl b/templates/view_xref.tpl
index bbfe2c3..2cab28b 100644
--- a/templates/view_xref.tpl
+++ b/templates/view_xref.tpl
@@ -6,7 +6,7 @@
 
 	<div class="body">
 		{legend legend="XRef Contents"}
-			<div class="row">
+			<div class="form-group">
 				{formlabel label="Cross Reference Link" for="xref"}
 				{forminput}
 					{if $xrefInfo.xref}
@@ -19,7 +19,7 @@
 				<div class="clear"></div>
 			</div>
 
-			<div class="row">
+			<div class="form-group">
 				{formlabel label="Reference Key" for="xkey"}
 				{forminput}
 					{if $xrefInfo.xkey }
@@ -32,7 +32,7 @@
 				<div class="clear"></div>
 			</div>
 
-			<div class="row">
+			<div class="form-group">
 				{formlabel label="Reference Text" for="xkey_ext"}
 				{forminput}
 					{if $xrefInfo.xkey_ext }
@@ -45,7 +45,7 @@
 				<div class="clear"></div>
 			</div>
 
-			<div class="row">
+			<div class="form-group">
 				{formlabel label="Reference Notes" for="data"}
 				{forminput}
 					{$xrefInfo.data|escape}
@@ -56,7 +56,7 @@
 		{/legend}
 
 		{legend legend="Start and Stop Dates"}
-			<div class="row">
+			<div class="form-group">
 				{formlabel label="Start Date" for=""}
 				{forminput}
 					{if $xrefInfo.ignore_start_date eq "y"}
@@ -69,7 +69,7 @@
 				<div class="clear"></div>
 			</div>
 
-			<div class="row">
+			<div class="form-group">
 				{formlabel label="End Date" for=""}
 				{forminput}
 					{if $xrefInfo.ignore_end_date eq "y"}
diff --git a/templates/view_xref_address.tpl b/templates/view_xref_address.tpl
index bdcb63e..18c8549 100644
--- a/templates/view_xref_address.tpl
+++ b/templates/view_xref_address.tpl
@@ -6,7 +6,7 @@
 
 	<div class="body">
 		{legend legend="Contents"}
-			<div class="row">
+			<div class="form-group">
 				{formlabel label="House Name/Number" for="xkey_ext"}
 				{forminput}
 					{if $xrefInfo.xkey_ext }
@@ -19,7 +19,7 @@
 				<div class="clear"></div>
 			</div>
 
-			<div class="row">
+			<div class="form-group">
 				{formlabel label="Postcode" for="xkey"}
 				{forminput}
 					{if $xrefInfo.xkey }
@@ -32,7 +32,7 @@
 				<div class="clear"></div>
 			</div>
 
-			<div class="row">
+			<div class="form-group">
 				{formlabel label="`$xrefInfo.template_title` Notes" for="data"}
 				{forminput}
 					{$xrefInfo.data|escape}
@@ -43,7 +43,7 @@
 		{/legend}
 
 		{legend legend="Start and Stop Dates"}
-			<div class="row">
+			<div class="form-group">
 				{formlabel label="Start Date" for=""}
 				{forminput}
 					{if $xrefInfo.ignore_start_date eq "y"}
@@ -56,7 +56,7 @@
 				<div class="clear"></div>
 			</div>
 
-			<div class="row">
+			<div class="form-group">
 				{formlabel label="End Date" for=""}
 				{forminput}
 					{if $xrefInfo.ignore_end_date eq "y"}
diff --git a/templates/view_xref_contact.tpl b/templates/view_xref_contact.tpl
index 6c9771e..c44f46e 100644
--- a/templates/view_xref_contact.tpl
+++ b/templates/view_xref_contact.tpl
@@ -6,7 +6,7 @@
 
 	<div class="body">
 		{legend legend="Content"}
-			<div class="row">
+			<div class="form-group">
 				{formlabel label="`$xrefInfo.template_title` Phone Number" for="xkey"}
 				{forminput}
 					{if $xrefInfo.xkey }
@@ -19,7 +19,7 @@
 				<div class="clear"></div>
 			</div>
 
-			<div class="row">
+			<div class="form-group">
 				{formlabel label="`$xrefInfo.template_title` Name" for="xkey_ext"}
 				{forminput}
 					{if $xrefInfo.xkey_ext }
@@ -32,7 +32,7 @@
 				<div class="clear"></div>
 			</div>
 
-			<div class="row">
+			<div class="form-group">
 				{formlabel label="`$xrefInfo.template_title` Notes" for="data"}
 				{forminput}
 					{$xrefInfo.data|escape}
@@ -43,7 +43,7 @@
 		{/legend}
 
 		{legend legend="Start and Stop Dates"}
-			<div class="row">
+			<div class="form-group">
 				{formlabel label="Start Date" for=""}
 				{forminput}
 					{if $xrefInfo.ignore_start_date eq "y"}
@@ -56,7 +56,7 @@
 				<div class="clear"></div>
 			</div>
 
-			<div class="row">
+			<div class="form-group">
 				{formlabel label="End Date" for=""}
 				{forminput}
 					{if $xrefInfo.ignore_end_date eq "y"}
diff --git a/templates/view_xref_key_seal.tpl b/templates/view_xref_key_seal.tpl
index 0cedaff..883e758 100644
--- a/templates/view_xref_key_seal.tpl
+++ b/templates/view_xref_key_seal.tpl
@@ -6,7 +6,7 @@
 
 	<div class="body">
 		{legend legend="Contents"}
-			<div class="row">
+			<div class="form-group">
 				{formlabel label="`$xrefInfo.template_title`" for="xkey"}
 				{forminput}
 					{if $xrefInfo.xkey }
@@ -19,7 +19,7 @@
 				<div class="clear"></div>
 			</div>
 
-			<div class="row">
+			<div class="form-group">
 				{formlabel label="Contract Number" for="xkey_ext"}
 				{forminput}
 					{if $xrefInfo.xkey_ext }
@@ -32,7 +32,7 @@
 				<div class="clear"></div>
 			</div>
 
-			<div class="row">
+			<div class="form-group">
 				{formlabel label="`$xrefInfo.template_title` Notes" for="data"}
 				{forminput}
 					{$xrefInfo.data|escape}
@@ -43,7 +43,7 @@
 		{/legend}
 
 		{legend legend="Start and Stop Dates"}
-			<div class="row">
+			<div class="form-group">
 				{formlabel label="Start Date" for=""}
 				{forminput}
 					{if $xrefInfo.ignore_start_date eq "y"}
@@ -56,7 +56,7 @@
 				<div class="clear"></div>
 			</div>
 
-			<div class="row">
+			<div class="form-group">
 				{formlabel label="End Date" for=""}
 				{forminput}
 					{if $xrefInfo.ignore_end_date eq "y"}
diff --git a/templates/view_xref_locate.tpl b/templates/view_xref_locate.tpl
index 542ff73..9aaeb05 100644
--- a/templates/view_xref_locate.tpl
+++ b/templates/view_xref_locate.tpl
@@ -6,7 +6,7 @@
 
 	<div class="body">
 		{legend legend="Contents"}
-			<div class="row">
+			<div class="form-group">
 				{formlabel label="Geographic Location" for="xref"}
 				{forminput}
 					<a class="item" href="http://www.openstreetmap.org/?lat={$xrefInfo.xkey_ext}&lon={$xrefInfo.xkey}&zoom=15&layers=MN" target="_blank">{tr}OpenStreetMap Link{/tr}</a>
@@ -15,7 +15,7 @@
 				<div class="clear"></div>
 			</div>
 
-			<div class="row">
+			<div class="form-group">
 				{formlabel label="Easting" for="xkey"}
 				{forminput}
 					{if $xrefInfo.xkey }
@@ -28,7 +28,7 @@
 				<div class="clear"></div>
 			</div>
 
-			<div class="row">
+			<div class="form-group">
 				{formlabel label="Northing" for="xkey_ext"}
 				{forminput}
 					{if $xrefInfo.xkey_ext }
@@ -41,7 +41,7 @@
 				<div class="clear"></div>
 			</div>
 
-			<div class="row">
+			<div class="form-group">
 				{formlabel label="Location Directions" for="data"}
 				{forminput}
 					{$xrefInfo.data|escape}
@@ -52,7 +52,7 @@
 		{/legend}
 
 		{legend legend="Start and Stop Dates"}
-			<div class="row">
+			<div class="form-group">
 				{formlabel label="Start Date" for=""}
 				{forminput}
 					{if $xrefInfo.ignore_start_date eq "y"}
@@ -65,7 +65,7 @@
 				<div class="clear"></div>
 			</div>
 
-			<div class="row">
+			<div class="form-group">
 				{formlabel label="End Date" for=""}
 				{forminput}
 					{if $xrefInfo.ignore_end_date eq "y"}
diff --git a/templates/view_xref_phone.tpl b/templates/view_xref_phone.tpl
index 0a8008a..77b3c03 100644
--- a/templates/view_xref_phone.tpl
+++ b/templates/view_xref_phone.tpl
@@ -6,7 +6,7 @@
 
 	<div class="body">
 		{legend legend="Contents"}
-			<div class="row">
+			<div class="form-group">
 				{formlabel label="`$xrefInfo.template_title` Number" for="xkey"}
 				{forminput}
 					{if $xrefInfo.xkey }
@@ -19,7 +19,7 @@
 				<div class="clear"></div>
 			</div>
 
-			<div class="row">
+			<div class="form-group">
 				{formlabel label="`$xrefInfo.template_title` Number Notes" for="data"}
 				{forminput}
 					{$xrefInfo.data|escape}
@@ -30,7 +30,7 @@
 		{/legend}
 
 		{legend legend="Start and Stop Dates"}
-			<div class="row">
+			<div class="form-group">
 				{formlabel label="Start Date" for=""}
 				{forminput}
 					{if $xrefInfo.ignore_start_date eq "y"}
@@ -43,7 +43,7 @@
 				<div class="clear"></div>
 			</div>
 
-			<div class="row">
+			<div class="form-group">
 				{formlabel label="End Date" for=""}
 				{forminput}
 					{if $xrefInfo.ignore_end_date eq "y"}
diff --git a/templates/view_xref_text.tpl b/templates/view_xref_text.tpl
index 620851d..aa15ead 100644
--- a/templates/view_xref_text.tpl
+++ b/templates/view_xref_text.tpl
@@ -6,7 +6,7 @@
 
 	<div class="body">
 		{legend legend="Contents"}
-			<div class="row">
+			<div class="form-group">
 				{formlabel label="`$xrefInfo.template_title`" for="xkey_ext"}
 				{forminput}
 					{if $xrefInfo.xkey_ext }
@@ -19,7 +19,7 @@
 				<div class="clear"></div>
 			</div>
 
-			<div class="row">
+			<div class="form-group">
 				{formlabel label="`$xrefInfo.template_title` Notes" for="data"}
 				{forminput}
 					{$xrefInfo.data|escape}
@@ -30,7 +30,7 @@
 		{/legend}
 
 		{legend legend="Start and Stop Dates"}
-			<div class="row">
+			<div class="form-group">
 				{formlabel label="Start Date" for=""}
 				{forminput}
 					{if $xrefInfo.ignore_start_date eq "y"}
@@ -43,7 +43,7 @@
 				<div class="clear"></div>
 			</div>
 
-			<div class="row">
+			<div class="form-group">
 				{formlabel label="End Date" for=""}
 				{forminput}
 					{if $xrefInfo.ignore_end_date eq "y"}