more ui edits
merge fixes