diff --git a/README.md b/README.md
index d26e883..83dd521 100644
--- a/README.md
+++ b/README.md
@@ -12,7 +12,7 @@ Check [live demo](http://plnkr.co/edit/PxBaZs?p=preview) in plunker
 ## Installation
 
 ```
-npm i -S angular2-datatable
+npm i -S @empite/angular2-datatable
 ```
 
 ## Usage example
diff --git a/package.json b/package.json
index 161c94e..e507c65 100644
--- a/package.json
+++ b/package.json
@@ -1,6 +1,6 @@
 {
-  "name": "angular2-datatable",
-  "version": "0.5.3",
+  "name": "@empite/angular2-datatable",
+  "version": "0.5.8",
   "description": "DataTable component for Angular2 framework",
   "main": "index.js",
   "scripts": {
diff --git a/src/BootstrapPaginator.ts b/src/BootstrapPaginator.ts
index 435ce0e..ea895d3 100644
--- a/src/BootstrapPaginator.ts
+++ b/src/BootstrapPaginator.ts
@@ -6,7 +6,12 @@ import * as _ from "lodash";
     selector: "mfBootstrapPaginator",
     template: `
     <mfPaginator #p [mfTable]="mfTable">
-        <ul class="pagination" *ngIf="p.dataLength > p.rowsOnPage">
+        <ul class="pagination" *ngIf="p.dataLength > minRowsOnPage">
+            <li class="page-item" *ngFor="let rows of rowsOnPageSet" [class.active]="p.rowsOnPage===rows" (click)="p.setRowsOnPage(rows)">
+                <a class="page-link" style="cursor: pointer">{{rows}}</a>
+            </li>
+        </ul>
+        <ul class="pagination pull-right" *ngIf="p.dataLength > p.rowsOnPage">
             <li class="page-item" [class.disabled]="p.activePage <= 1" (click)="p.setPage(1)">
                 <a class="page-link" style="cursor: pointer">&laquo;</a>
             </li>
@@ -41,11 +46,6 @@ import * as _ from "lodash";
                 <a class="page-link" style="cursor: pointer">&raquo;</a>
             </li>
         </ul>
-        <ul class="pagination pull-right float-sm-right" *ngIf="p.dataLength > minRowsOnPage">
-            <li class="page-item" *ngFor="let rows of rowsOnPageSet" [class.active]="p.rowsOnPage===rows" (click)="p.setRowsOnPage(rows)">
-                <a class="page-link" style="cursor: pointer">{{rows}}</a>
-            </li>
-        </ul>
     </mfPaginator>
     `
 })
diff --git a/src/DefaultSorter.ts b/src/DefaultSorter.ts
index be46554..dc8323a 100644
--- a/src/DefaultSorter.ts
+++ b/src/DefaultSorter.ts
@@ -6,8 +6,8 @@ import {DataTable, SortEvent} from "./DataTable";
     template: `
         <a style="cursor: pointer" (click)="sort()" class="text-nowrap">
             <ng-content></ng-content>
-            <span *ngIf="isSortedByMeAsc" class="glyphicon glyphicon-triangle-top" aria-hidden="true"></span>
-            <span *ngIf="isSortedByMeDesc" class="glyphicon glyphicon-triangle-bottom" aria-hidden="true"></span>
+            <span *ngIf="isSortedByMeAsc" class="dt--icon_sort glyphicon glyphicon-sort-by-attributes" aria-hidden="true"></span>
+            <span *ngIf="isSortedByMeDesc" class="dt--icon_sort glyphicon glyphicon-sort-by-attributes-alt" aria-hidden="true"></span>
         </a>`
 })
 export class DefaultSorter implements OnInit {