bug fixes related to recent review feedback.
Attached images get squashed and stretched when displayed