Cut the Mustard + Finalized Enhanced Nav