partially fixed pagination
Merge branch 'feature/Output' into liveSystem