Added description entry, submit/cancel buttons, and removed popover when
"edit" is selected