Moved environment variables to pam_environment
Changed screen order