Fixed some problem related to the settings bar