Fixed layout and added "Save" button