Changed main application file. Marionette implementation