Updating marionette site with fixes