Mini-refactor on dashboard