Nav cleanups,Template Cleanups,Enabled variants