fix World Buttons remaining active after code change
merge