Update per mockup from Guiceworks