Changed layout to grid