Fixing image issue where width was forcing 100%. Also fixing Issues #1 and #2