Added changes for our High-Fi mockups.