Misc devel stuff
Change store layout