changed nav bar and moved some things around