CSS and sizing changes
Merge