updating all views to use the new base.html pages; consolidation of site assets
fixed merged conflicts due to changing to new base