re-order for better view