ui changes
UI updates
merge merge merge
other little changes