Address CR, add test for order, restyle