Small adaptations for picture viewer