Added buttons for saving and closing