Major development
UI Update and publish
Merge ds-store