Tdh merged 2

Minor, but I feel like making all four of these is premature. A single grid_padding would make things a bit simpler now and wouldn't be especially hard to change later on if needed.