Added additional span and classes to fix thumbnail image hogging column

...and refactored HTML/CSS. fixes #SCM-9283