Bunch of design updates