Added Kaminari and Pagination
Fixed Merge Conflics