Overhaul 'manage users' and some minor changes