Integration CSS, bug fixes