added order option (can be merged as soon as refactoring of core layout is finished)
completed order feature
Merged order feature branch