more improvements
added store specific toolbar and layout