Fixup #7 Navigation bar problems