Dashboard Management fixes

Couple of fixes for the dashboard management screens, see commits for details.