Navigation style cleanup