Revert 4096 and fix nav resize

tested in Chrome, FF, opera