made some changes
Merging into master UI changes
Merge branch 'changes'
Merge branch 'master' into changes