Merge "Implement UI for dual target tiles" into main