Feature/etch 351 make grid into a non component component like wrap

Feature/etch 351 make grid into a non component component like wrap #44