Changes to layout using CSS
Changed in CSS and conflict resolution with master