Better comments
Fixed needless UI update when image no longer being viewed
Formatting & comments