diff --git a/admin-dev/themes/default/template/controllers/stores/helpers/form/form.tpl b/admin-dev/themes/default/template/controllers/stores/helpers/form/form.tpl
index fd0cf862f..0e4da98d6 100644
--- a/admin-dev/themes/default/template/controllers/stores/helpers/form/form.tpl
+++ b/admin-dev/themes/default/template/controllers/stores/helpers/form/form.tpl
@@ -61,7 +61,7 @@
 			{if $input.type == 'file'}
 				<div class="row">
 					<label class="control-label col-lg-3">{$input.label} </label>
-					<div class="col-lg-6">
+					<div class="col-lg-9">
 						<input type="file" name="{$input.name}" />
 						{if isset($input.desc)}<p>{$input.desc}</p>{/if}
 						{if isset($fields_value.image) && $fields_value.image}
@@ -78,23 +78,15 @@
 				</div>
 			{/if}
 			<div class="row">
-				<table class="table">
-					<thead>
-						<tr>
-							<th>{l s='Hours:'}</th>
-							<th>{l s='e.g. 10:00AM - 9:30PM'}</th>
-						</tr>
-					</thead>
-					<tbody>
-						{foreach $fields_value.days as $k => $value}
-							<tr style="color: #7F7F7F; font-size: 0.85em;">
-								<td>{$value}</td>
-								<td><input type="text" size="25" name="hours_{$k}" value="{if isset($fields_value.hours[$k-1])}{$fields_value.hours[$k-1]|escape:'htmlall'}{/if}" /><br /></td>
-							</tr>
-						{/foreach}
-					</tbody>
-				</table>
+				<label class="control-label col-lg-3">{l s='Hours:'}</label>
+				<div class="col-lg-9"><p class="form-control-static">{l s='e.g. 10:00AM - 9:30PM'}</p></div>
 			</div>
+			{foreach $fields_value.days as $k => $value}
+			<div class="row">
+				<label class="control-label col-lg-3">{$value}</label>
+				<div class="col-lg-9"><input type="text" size="25" name="hours_{$k}" value="{if isset($fields_value.hours[$k-1])}{$fields_value.hours[$k-1]|escape:'htmlall'}{/if}" /></div>
+			</div>
+			{/foreach}
 		{/foreach}
 	{/if}
 {/block}
diff --git a/controllers/admin/AdminStoresController.php b/controllers/admin/AdminStoresController.php
index 336a79d54..adcb0c673 100644
--- a/controllers/admin/AdminStoresController.php
+++ b/controllers/admin/AdminStoresController.php
@@ -125,7 +125,7 @@ class AdminStoresControllerCore extends AdminController
 
 		if ($this->display == 'options')
 			unset($this->toolbar_btn['new']);
-		else
+		else if ($this->display != 'add' && $this->display != 'edit')
 			unset($this->toolbar_btn['save']);
 	}