style fix on the tiles.
Merge remote-tracking branch 'origin/master'