Start of redesign
fixed merge conflict
bit more style
middle row basic styled again
margins set
sorted top row THAT TOOK AGES!
style
Merge branch 'dashboard' into development