Adding live save and improving UX