[CLEANUP] Major structure overhaul for dashboard