fixed navbar hilighting
Merge with jack
Fixed dividers and topbar transitions