UI changes, merge fixes