Cleaned up cache resources
Moved pagination to fragment
Cleaned up code