[NEW] Some tweaks for dynamic image loading

Not the best working solution!