updated view
Merge branch 'dashboard' into design