Dashboard UI
Dashboard set up
merge