fixed style with paginator
Merge branch 'bug_629' into staging