Fixed Calculator Navigation.