Added better handling of tap to show navigation.