cleanup, make the save button ready for future layout