added popover, updated controllers and validation