Separate marker, add layer control