category label and pagination component positioning (issue #4423, issue #4425), minor refactoring (issue #4438)
category label and pagination component positioning (issue #4423, issue #4425), minor refactoring (issue #4438)