Organize option fields