Templates visibility and indentation fixed