Carling's fixes and combine leaftlet with other stylesheets
Update events