Styling fixes by Emanuel and Sonia