Merge "Small UI improvements for tiles" into main