Fixing some order related display bugs