made some changes
Merging into master UI changes