removed unused templates, page context working