Updated images and functionality