Fix order display wrong
Fix issues as feedback