Added the new classes to get the desire layout. I added <!-- TODO:: --> comments in areas where added functionality is needed to match our prototype