carrying over top-bar template changes