Removed complex views and added some partials.  I still think there is a...

... lot more refactoring that can be done within these views but this is a good start