Changed position of setting in settingscreen and renamed some variables to match the other ones.