Refactored Views to implement routes correctly and made page look

a little nicer
Tim and Darren