Support layer options override. Fix gutter.