fixed the UI issues