Update with latest design changes