More CSS updates and fixes