Added some order logic and appearance