add "new order" block
fix bugs