dashboard positioning and layout completed
Merge branch 'dashboard' into Steph