UI update
Merge fix