Many design updates