design updates and re-org