swapping around input sections

 + swapping rate structure/loan term + changing location to state