This will likely need a redo in KiCAD. Features like the "Align horizontally" would make a big difference.