added order views
refactoring