Rearranged layout to be more compact, reduced board length.