Aesthetic changes to layout