UPdated views and settingscontroller