Made changes to more closely reflect dustins new mockups.