Merge "Rework the UI Menu"