Working on backend
Before Tables Revamp
Fixed Pagination
Merge remote-tracking branch 'origin/master'