Improve UI: save button, text field, switch