Added grid back in, need proper cleanup though