slight refactoring of dashboard
merged