Improve readability
Add paging to tv section