initial version of new ui for store
conflict resolved