adjust settings
adjust css for japanease
Merge branch 'design' into source