fixes to order tab etc.