Another big batch of design updates