Minor UI changes
Fix merge conflict