Separated some logic in views, added Marionette