Code update +  Settings new feature
Code improvements