Changes to navbar. Not finished but commited so that others can work.