UI improvements
Merge fix