Styling changes to bring things in line with mock-up