Clean up nav code