Add GridItem, GridItemTest to Project
Refactor to use GridItem