Improving usability

Changed order and language of preferences to create a more intuitive flow.