UI changes, bug fixes, Collection, feedback implementation