Fixed some parts of the settings pannel