Various design updates