Refactorings to commons
Minor refactoring in dashboard for consistency across the module