working on dashboard
merge conflict fix with tims stuff
merge conflict fix with tims stuff
Added more styling