[#1196] Updated the secondary menu and language switcher