CSS/JavaScript clean-up, bug fixes in collocation