Feature/tile layout