Fixed templates for new navbar generation