Dashboard

Merging lots of changes from the dashboard branch.