some updates in order view
Merge remote-tracking branch 'origin/master'
Merge remote-tracking branch 'origin/master'
some changes in Order view