dashboard template refactoring