Added grid size option / general tidy