added grid layout and fixed css issues for grid layout