Updated settings controller and removed dependency on welcome controller