Bug fix with encoding
Styles changed a little