Fix bugs
Fix bug order view