Improve readability of Dashboard methods
-Fix performance/ hours left bug