Reverted some navigation button logic due