List updates

Several fixes aimed at making lists less confusing and slightly easier to manage.