rearange input sields and thei names