cleanup and use scrolledwindow to display image rather than custom draw - issue #289