Cleaned up interface and added UI elements