fix serveral bugs in merchant new design