Updating template fns to work with menu changes