Refactor and add some javi images