UI and some other changes