Modification of inputs

Placed the prompts and validations in order.