random log crap
more dev log merge conflicts
minor css formatting of nav bar