Changes to reflect latest design specs.