More CSS changes and fixes