Better UI and more UI polish