Changes to reflect Breeze mockup