Deleted useless lines and changed position Cancel button & Save button