Refactor dashboard controller. Partials are dynamic now
Merges commits