Some more UI changes, as well as saving issues. Nothing major.