Moved Navigation Settings into Navigation UI