navbar changes, lm changes

Coming along nicely :)