Tidy up user & ship editing