Issue #317, navigation bar