Update Controls/GUIs to be compatible with all the changes