Tweak formatting of client dashboard
fix merge conflicts
Merge remote-tracking branch 'upstream/master'
Merge pull request #2 from epollan/master

Merged #2