Payment mode in form
Preparation for displaying shipping costs
Removed commented line