Updated UI and fixed issues with dropdowns