Merged datastores, improved UI flow, animation fixes