collection UI tweaks and partial refactoring