Add proper widget chooser (instead of simple dropdown list)