admin nav not working, code style, plus backporting several things from 3.1 list model etc
tweaking & reverting some of the last changes