Tile and Layout Refactoring