navbar resizing works better now
fixed navbar resizing mostly
fixed merge conflicts