Ui changes and some Naming