Updated framework with grid layout