Numerous changes focused around the UI