Fixed the top nav issues