Merge "Rework the UI"