Refactored Store and Gallery. Require layout corrections and style refactoring