Refactored. Added Dashboard
Refactored