refactor grid with content