Updated UI and Cleaned Code