Dashboard layout
Merge branch master