Minor layout and PCB changes