Added NopShop theme and some layout changes