Added settings view/controller and modal