Fixing some problems on widgets UI with #499