Patch for #106

Patch for #106

Also includes css font fixes.