big refactoring with dashboard