Made UI updates and cleaned old GUI code