Revamped the images plugin