Fixes for tile layout