REFACTOR dashboard