Small design changes throughout