Small design updates