Updated layouts and mockups