improvements to template system
fix issue with pulling content in controllers
fix issue with pulling content in controllers
fix issue with retrieving page data