Mockups updated based on feedback 2013-01-21