storyboard changes, adding edit/done buttons, other button changes, bug fixes