Fixes to settings and dashboard

see commits for individual fixes