Re-arrange input class