Fixed orders table display
Merged from master
Removed depedency on notifications