General: Cleaned up and added new GUIs