Changed way of  defining dashboard's theme
Slight changes in styles
Merge remote-tracking branch 'origin/master'