Big patch to PetjaUI