A little bit of missed cleanup. Also add active class for 3 navbar variations.