Add proper encoding handling
Modify styles