Merged upstream changes + added missing sortpage and edited listview to show statistics nicely in boxes