Next iteration of wireframe based on wireframe 1 + user feedback. <!--- @huboard:{"order":9.00180009,"milestone_order":10.0020001,"custom_state":""} -->
