navbar bugfixes + doc changes
merge