Review

a lot of code changed
they were removed in SettingsFragment