Cleaned up some naming and added an event for completed setup of the grid