Rethinking the PCB layout to be more compact.
More compact still. Need to check solderability.