Refactoring of orders management sections and text