Navigation improvements

Clearer desktop navigation with white backgrounds for selected top
level navigation item and second level navigation items