Updated contstants to the class level so they can be overridden.
Removed open new window from images.