Edit popover and fix bug with registration template