Buttons refactored, added confirm button