Fixed some settings section issues