Some clean ups and reworks of the dashboard page