Initial display of add order item buttons Fixes #5991

Also Closes #5994