Rework of dashboard.