Cleaned up the imports in the Grid Square View