CSS update and bug fixes