Way You Look Tonight, The - Jerome Kern

This is my first time to post a chart, so I am not sure I did it correctly (hope so).
-I am trying to get bars 13-16, plus the 2nd ending, onto one line.
-Secondly, I ran out of space on the page. The "C" section is 20 bars.
-Thirdly, I want to add a 4 or perhaps 8 bar ending.

All of you moderators and knowledgeable people have been so helpful. You people are AWESOME! Thank you so much for your attention and patience. I owe you all a really big thanks. This is a wonderful app, and a wonderful community.
TQ