Merge "Rework UI"