Refactoring for dashboard & dash improvements