refactored save-button code & fixed positioning