Fixed grid, and added includes for promos