UI changes
Merge branch 'master' into compatibility_mode