More navigation tweaking, fixed everything but li