fix offscreen navbar issues #269 and #270