Fix bug with thumbnail widths.

"width  + 5" yields surprising results if width is a string.

Document type of width/height and be consistent about 'px' suffixes.

Change-Id: Ia004f9fcd9c7a1d5b32ec3c674b0746f951f7701