Corrected a save bug and a ui bug