More UI List Fixes