refactor gridcontainer