fix save + improve UX