Wireframes Updated

Updated the wireframes based on our group meeting.  Let me know if I'm
missing something!