Issue #317, right navbar