put dashboard in its own controller
merged