began with fixing grid-group
style fixes
solved merge conflicts