Updated UI and removed unused Code