Merge "UI updates to dual target tiles"