Make display size optional, rm Marionette from bundle