Tidy up player edit screen and add custom menu icons