Dashboard views design
Fixed merge conflicts
Merge pull request #16 from purplemartin/Views/Design

Views/design