Merge branch 'nari'
create css & modify wording