added grid layout
merging