more cleanup and a saving btn