Add a wrapper for tile view
Better way to do a scale
Sync with master