Updated UI and fixed issues