added proper grid layout