Major refactor for dashboard UI
Check user flow for site