Added "Done" and "Cancel" buttons to popover