Re-arrange input class
Re-arrange input class