Reorganize input options