Better image sizing. Closes #22