Various design updates.