Multiple lists, UI and internal storage changes