Order selection and display fix
Merge pull request #8 from Axelena/order_selection

Order selection and display fix