Merged in master and modified dashboard styling [IK]

2 jobs for master in 2 minutes and 17 seconds (queued for 1 second)