Additional styling and and a fix to encoding issues