changed view orders
Merge github.com:novius-os/core into master/0.2