Fix new proposal
Fixes #20 Add "Terms and Conditions" popup (?) panel in new proposal
Reorganize form