Cleaned up controls UI hacks