Updated store
Improved JS