Rework of dashboard in progress