Made settings more functional