System settings functionality code changes