Added pagering + fixed some issues