minor changes
enable utf-8 support
change layout