UI fixes, and collocation fixes