Added grid and other minor amends