fix some text and order view