Adding fixes for top navigation.