Added the dashboard and some clean up.