Fixed all settings functionalities