Minor code clean-up
Fix code clean-up
Fix image display to work on Firefox