Re-arranged input fields