Fixes to server management screen