change dashboard layout
fixed conflicts
Merge branch 'navbarfix'
Fix layout
Merge remote-tracking branch 'origin/morelayouts'