Added orders page
Merge branch 'develop' into staging
Fixed type
Merge branch 'develop' into staging