Updated Wireframes

All is completed with exception to the schedule layout. I am trying to
make this more intuitive and a bit more polished.