Made changes to the Setting Tab