Removed unused templates, sidebars updated