Nav tweaking, still needs more work