add order bundle
view and test tweaking