charge delete button added back. refactored form view