Fixed comment toggle again :P
refactoring, take image bounds from element if visible, closes #3