Updates for handling lists, UX