Minor fixes, rename navbar include