Adapt to latest design changes