Dashboard rework