Fixed existing tiles
New layout works