Correct widget types menu + add option to popover to close itself when user click