Improved layout of store