Lots of design updates