Changes to dashboard - refactor and menu modular