Made UI changes and others
Merged