improved the dashboard. Need to improve the coding style to make it more re-usable