Bug (hopefully) fixed which caused UI elements to be switched sometimes.