Templates visibility fixed