more UI changes
merging heads