Updated layout with blocks