CSS updates and bug fixes