added grid
updated indentation
merge dev