Rework dashboard model