Templates visibility fixed and dropdown added