navbar updates... almost done, just need to get collapse working correctly.