added the form input display fix and cleaned up data