refactor order list view
Yes , you guessed right , girl again .Merge branch 'working' into develop