Minor template menu changes