Fix bugs in dashboard

This should fix any remaining bugs in the dashboard.