changed order flow a bit. some new views added.
fixed merge problems