diff --git a/classes/controller/FrontController.php b/classes/controller/FrontController.php
index d636b6325..4b6c0503f 100755
--- a/classes/controller/FrontController.php
+++ b/classes/controller/FrontController.php
@@ -705,7 +705,7 @@ class FrontControllerCore extends Controller
 		$this->addJS(_THEME_MOBILE_JS_DIR_.'jqm-docs.js');
 		$this->addJS(_PS_JS_DIR_.'tools.js');
 		$this->addJS(_THEME_MOBILE_JS_DIR_.'global.js');
-			$this->addjqueryPlugin('fancybox');
+		$this->addjqueryPlugin('fancybox');
 
 		$this->addCSS(_THEME_MOBILE_CSS_DIR_.'jquery.mobile-1.3.0.min.css', 'all');
 		$this->addCSS(_THEME_MOBILE_CSS_DIR_.'jqm-docs.css', 'all');
@@ -721,6 +721,7 @@ class FrontControllerCore extends Controller
 			$this->setMobileMedia();
 			return true;
 		}
+		$this->addCSS(_THEME_CSS_DIR_.'grid_prestashop.css', 'all');
 		$this->addCSS(_THEME_CSS_DIR_.'global.css', 'all');
 		$this->addjquery();
 		$this->addjqueryPlugin('easing');
diff --git a/controllers/admin/AdminPerformanceController.php b/controllers/admin/AdminPerformanceController.php
index 80df339b6..c19b3c221 100644
--- a/controllers/admin/AdminPerformanceController.php
+++ b/controllers/admin/AdminPerformanceController.php
@@ -26,6 +26,13 @@
 
 class AdminPerformanceControllerCore extends AdminController
 {
+
+	public function __construct()
+	{
+		$this->className = 'Configuration';
+		parent::__construct();		
+	}
+	
 	public function initFieldsetSmarty()
 	{
 		$this->fields_form[0]['form'] = array(
@@ -541,6 +548,7 @@ class AdminPerformanceControllerCore extends AdminController
 
 	public function postProcess()
 	{
+	
 		/* PrestaShop demo mode */
 		if (_PS_MODE_DEMO_)
 		{
@@ -617,6 +625,9 @@ class AdminPerformanceControllerCore extends AdminController
 		{
 			if ($this->tabAccess['edit'] === '1')
 			{
+				$theme_cache_directory = _PS_ALL_THEMES_DIR_.$this->context->shop->theme_directory.'/cache/';							
+				if (((bool)Tools::getValue('PS_CSS_THEME_CACHE') || (bool)Tools::getValue('PS_JS_THEME_CACHE')) && !is_writable($theme_cache_directory))
+					$this->errors[] = Tools::displayError(sprintf($this->l('To use Smart Cache directory %s must be writable.'), realpath($theme_cache_directory)));
 				if (!Configuration::updateValue('PS_CSS_THEME_CACHE', (int)Tools::getValue('PS_CSS_THEME_CACHE')) ||
 					!Configuration::updateValue('PS_JS_THEME_CACHE', (int)Tools::getValue('PS_JS_THEME_CACHE')) ||
 					!Configuration::updateValue('PS_HTML_THEME_COMPRESSION', (int)Tools::getValue('PS_HTML_THEME_COMPRESSION')) ||
@@ -665,9 +676,8 @@ class AdminPerformanceControllerCore extends AdminController
 			else
 				$this->errors[] = Tools::displayError('You do not have permission to edit this.');
 		}
-
 		if ((bool)Tools::getValue('ciphering_up') && Configuration::get('PS_CIPHER_ALGORITHM') != (int)Tools::getValue('PS_CIPHER_ALGORITHM'))
-		{
+		{				
 			if ($this->tabAccess['edit'] === '1')
 			{
 				$algo = (int)Tools::getValue('PS_CIPHER_ALGORITHM');
@@ -793,8 +803,6 @@ class AdminPerformanceControllerCore extends AdminController
 			Hook::exec('action'.get_class($this).ucfirst($this->action).'After', array('controller' => $this, 'return' => ''));
 			Tools::redirectAdmin(self::$currentIndex.'&token='.Tools::getValue('token').'&conf=4');
 		}
-		else
-			return parent::postProcess();
 	}
 
 	public function ajaxProcess()
diff --git a/themes/default/css/global.css b/themes/default/css/global.css
index be311521b..65080eac9 100644
--- a/themes/default/css/global.css
+++ b/themes/default/css/global.css
@@ -2,8 +2,6 @@
 	PRESTASHOP CSS
 ################################################################################################## */
 
-@import url("grid_prestashop.css");
-
 /* ****************************************************************************
 		reset
 **************************************************************************** */