Merge Kyle's design changes