Dashboard updates

Fixes numerous fixes in preparation for Milestone 1