UI improvements
Fix merge conflict