Correct layout issues on old navigator