Tidy up of manage screen