Client Demographic - adding lines

In the client demographic, is lacking a second place for a phone number if a client/family has two numbers. For instance, one client has a cell and a Google Voice number they use for work. Another client has an int'l cell and a US cell. Currently, the only way to add a second number is to add another line on the Personal Information section and have the same individual listed twice. HOWEVER, if you add a second line after that section has been established, it puts the new line all the way at the bottom, making you look for it.

It would be very helpful to have 1) adding a line stay where I added it (eg, adding new row under 4 stays at row 4, instead of going to the bottom) or 2) adding a spot for names & numbers.