[[ ProperList ]] Pull proper list related changes from widgets branch