UI improvements

Margins and such, as well as back button and save UI