cleaned up UI
UI updates
merge conflict resolved