Added settings and Marionette