Small code update

  • Update J4 / J5 compatible
  • Update in ordering of items