Refactor UI to use only one set of collections