Adjust style and do some small refactoring.
Combine paging feature into relations feature