Fixed solution for #175 #196

Wrapping of user images fixed, unmatched lines in fixed column view fixed.
Fix two small errors
Merge pull request #207 from ppv1979/patch-1

Fixed solution for #175 #196
Merge remote-tracking branch 'upstream/master'