More CSS changes/fixes