Improved the way nav-based styles work.