Improve Layout and OrderList