Remove unused code, fix list-nav visibility