Fixed up exiting to work with saving code, fixed some button display