re-organized the dashboard a bit

Change-Id: Ibda6b51599babcabc1223c96e559a9c4937d4bc8