Further work on dashboard