Made "Edit" focus the text box
Removed unused textfield, changed layout somewhat
Changed small things