diff --git a/client/app/app.component.ts b/client/app/app.component.ts
index 20c8c8724..965848105 100644
--- a/client/app/app.component.ts
+++ b/client/app/app.component.ts
@@ -49,13 +49,13 @@ import {
 })
 
 export class AppComponent {
-  isLoggedIn: boolean;
-  search_field: string = name;
   choices = [];
+  isLoggedIn: boolean;
 
-  constructor(private friendService: FriendService,
-              private authService: AuthService,
-              private router: Router
+  constructor(
+    private authService: AuthService,
+    private friendService: FriendService,
+    private router: Router
   ) {
     this.isLoggedIn = this.authService.isLoggedIn();
 
@@ -71,8 +71,8 @@ export class AppComponent {
   onSearch(search: Search) {
     if (search.value !== '') {
       const params = {
-        search: search.value,
-        field: search.field
+        field: search.field,
+        search: search.value
       };
       this.router.navigate(['VideosList', params]);
     } else {
@@ -100,7 +100,7 @@ export class AppComponent {
   quitFriends() {
     this.friendService.quitFriends().subscribe(
       status => {
-          alert('Quit friends!');
+        alert('Quit friends!');
       },
       error => alert(error)
     );
diff --git a/client/app/shared/search.component.ts b/client/app/shared/search.component.ts
index 674518aba..e1e30b9af 100644
--- a/client/app/shared/search.component.ts
+++ b/client/app/shared/search.component.ts
@@ -14,26 +14,21 @@ import { SearchField } from './search-field.type';
 export class SearchComponent {
   @Output() search = new EventEmitter<Search>();
 
-  searchCriterias: Search = {
-    field: 'name',
-    value: ''
-  };
-
   fieldChoices = {
     name: 'Name',
     author: 'Author',
     podUrl: 'Pod Url',
     magnetUri: 'Magnet Uri'
   };
+  searchCriterias: Search = {
+    field: 'name',
+    value: ''
+  };
 
   get choiceKeys() {
     return Object.keys(this.fieldChoices);
   }
 
-  getStringChoice(choiceKey: SearchField) {
-    return this.fieldChoices[choiceKey];
-  }
-
   choose($event: MouseEvent, choice: SearchField) {
     $event.preventDefault();
     $event.stopPropagation();
@@ -45,4 +40,7 @@ export class SearchComponent {
     this.search.emit(this.searchCriterias);
   }
 
+  getStringChoice(choiceKey: SearchField) {
+    return this.fieldChoices[choiceKey];
+  }
 }
diff --git a/client/app/users/login/login.component.ts b/client/app/users/login/login.component.ts
index 8e369541d..09c5f1af7 100644
--- a/client/app/users/login/login.component.ts
+++ b/client/app/users/login/login.component.ts
@@ -10,7 +10,10 @@ import { AuthService, AuthStatus, User } from '../shared/index';
 })
 
 export class UserLoginComponent {
-  constructor(private authService: AuthService, private router: Router) {}
+  constructor(
+    private authService: AuthService,
+    private router: Router
+  ) {}
 
   login(username: string, password: string) {
     this.authService.login(username, password).subscribe(
diff --git a/client/app/users/shared/auth.service.ts b/client/app/users/shared/auth.service.ts
index b1da94436..d63fe38f3 100644
--- a/client/app/users/shared/auth.service.ts
+++ b/client/app/users/shared/auth.service.ts
@@ -7,14 +7,14 @@ import { User } from './user.model';
 
 @Injectable()
 export class AuthService {
-  private static BASE_LOGIN_URL = '/api/v1/users/token';
   private static BASE_CLIENT_URL = '/api/v1/users/client';
+  private static BASE_LOGIN_URL = '/api/v1/users/token';
 
   loginChangedSource: Observable<AuthStatus>;
 
-  private loginChanged: Subject<AuthStatus>;
   private clientId: string;
   private clientSecret: string;
+  private loginChanged: Subject<AuthStatus>;
 
   constructor(private http: Http) {
     this.loginChanged = new Subject<AuthStatus>();
@@ -37,40 +37,14 @@ export class AuthService {
       );
   }
 
-  login(username: string, password: string) {
-    let body = new URLSearchParams();
-    body.set('client_id', this.clientId);
-    body.set('client_secret', this.clientSecret);
-    body.set('response_type', 'code');
-    body.set('grant_type', 'password');
-    body.set('scope', 'upload');
-    body.set('username', username);
-    body.set('password', password);
-
-    let headers = new Headers();
-    headers.append('Content-Type', 'application/x-www-form-urlencoded');
-
-    let options = {
-      headers: headers
-    };
-
-    return this.http.post(AuthService.BASE_LOGIN_URL, body.toString(), options)
-                    .map(res => res.json())
-                    .catch(this.handleError);
-  }
-
-  logout() {
-    // TODO make HTTP request
+  getAuthRequestOptions(): RequestOptions {
+    return new RequestOptions({ headers: this.getRequestHeader() });
   }
 
   getRequestHeader() {
     return new Headers({ 'Authorization': `${this.getTokenType()} ${this.getToken()}` });
   }
 
-  getAuthRequestOptions(): RequestOptions {
-    return new RequestOptions({ headers: this.getRequestHeader() });
-  }
-
   getToken() {
     return localStorage.getItem('access_token');
   }
@@ -97,6 +71,32 @@ export class AuthService {
     }
   }
 
+  login(username: string, password: string) {
+    let body = new URLSearchParams();
+    body.set('client_id', this.clientId);
+    body.set('client_secret', this.clientSecret);
+    body.set('response_type', 'code');
+    body.set('grant_type', 'password');
+    body.set('scope', 'upload');
+    body.set('username', username);
+    body.set('password', password);
+
+    let headers = new Headers();
+    headers.append('Content-Type', 'application/x-www-form-urlencoded');
+
+    let options = {
+      headers: headers
+    };
+
+    return this.http.post(AuthService.BASE_LOGIN_URL, body.toString(), options)
+                    .map(res => res.json())
+                    .catch(this.handleError);
+  }
+
+  logout() {
+    // TODO make HTTP request
+  }
+
   setStatus(status: AuthStatus) {
     this.loginChanged.next(status);
   }
diff --git a/client/app/videos/shared/video.model.ts b/client/app/videos/shared/video.model.ts
index 2b018ad86..614403d79 100644
--- a/client/app/videos/shared/video.model.ts
+++ b/client/app/videos/shared/video.model.ts
@@ -1,24 +1,15 @@
 export class Video {
-  id: string;
-  name: string;
-  description: string;
-  magnetUri: string;
-  podUrl: string;
-  isLocal: boolean;
-  thumbnailPath: string;
   author: string;
-  createdDate: Date;
   by: string;
+  createdDate: Date;
+  description: string;
   duration: string;
-
-  private static createDurationString(duration: number) {
-    const minutes = Math.floor(duration / 60);
-    const seconds = duration % 60;
-    const minutes_padding = minutes >= 10 ? '' : '0';
-    const seconds_padding = seconds >= 10 ? '' : '0';
-
-    return minutes_padding + minutes.toString() + ':' + seconds_padding + seconds.toString();
-  }
+  id: string;
+  isLocal: boolean;
+  magnetUri: string;
+  name: string;
+  podUrl: string;
+  thumbnailPath: string;
 
   private static createByString(author: string, podUrl: string) {
     let [ host, port ] = podUrl.replace(/^https?:\/\//, '').split(':');
@@ -32,28 +23,38 @@ export class Video {
     return author + '@' + host + port;
   }
 
+  private static createDurationString(duration: number) {
+    const minutes = Math.floor(duration / 60);
+    const seconds = duration % 60;
+    const minutes_padding = minutes >= 10 ? '' : '0';
+    const seconds_padding = seconds >= 10 ? '' : '0';
+
+    return minutes_padding + minutes.toString() + ':' + seconds_padding + seconds.toString();
+  }
+
   constructor(hash: {
-    id: string,
-    name: string,
-    description: string,
-    magnetUri: string,
-    podUrl: string,
-    isLocal: boolean,
-    thumbnailPath: string,
     author: string,
     createdDate: string,
+    description: string,
     duration: number;
+    id: string,
+    isLocal: boolean,
+    magnetUri: string,
+    name: string,
+    podUrl: string,
+    thumbnailPath: string
   }) {
-    this.id = hash.id;
-    this.name = hash.name;
-    this.description = hash.description;
-    this.magnetUri = hash.magnetUri;
-    this.podUrl = hash.podUrl;
-    this.isLocal = hash.isLocal;
-    this.thumbnailPath = hash.thumbnailPath;
     this.author  = hash.author;
     this.createdDate = new Date(hash.createdDate);
+    this.description = hash.description;
     this.duration = Video.createDurationString(hash.duration);
+    this.id = hash.id;
+    this.isLocal = hash.isLocal;
+    this.magnetUri = hash.magnetUri;
+    this.name = hash.name;
+    this.podUrl = hash.podUrl;
+    this.thumbnailPath = hash.thumbnailPath;
+
     this.by = Video.createByString(hash.author, hash.podUrl);
   }
 
diff --git a/client/app/videos/shared/video.service.ts b/client/app/videos/shared/video.service.ts
index b6e0800a0..7b6519f00 100644
--- a/client/app/videos/shared/video.service.ts
+++ b/client/app/videos/shared/video.service.ts
@@ -12,7 +12,16 @@ import { Video } from './video.model';
 export class VideoService {
   private static BASE_VIDEO_URL = '/api/v1/videos/';
 
-  constructor(private http: Http, private authService: AuthService) {}
+  constructor(
+    private authService: AuthService,
+    private http: Http
+  ) {}
+
+  getVideo(id: string) {
+    return this.http.get(VideoService.BASE_VIDEO_URL + id)
+                    .map(res => <Video> res.json())
+                    .catch(this.handleError);
+  }
 
   getVideos(pagination: Pagination, sort: SortField) {
     const params = this.createPaginationParams(pagination);
@@ -25,12 +34,6 @@ export class VideoService {
                     .catch(this.handleError);
   }
 
-  getVideo(id: string) {
-    return this.http.get(VideoService.BASE_VIDEO_URL + id)
-                    .map(res => <Video> res.json())
-                    .catch(this.handleError);
-  }
-
   removeVideo(id: string) {
     const options = this.authService.getAuthRequestOptions();
     return this.http.delete(VideoService.BASE_VIDEO_URL + id, options)
@@ -50,6 +53,17 @@ export class VideoService {
                     .catch(this.handleError);
   }
 
+  private createPaginationParams(pagination: Pagination) {
+    const params = new URLSearchParams();
+    const start: number = (pagination.currentPage - 1) * pagination.itemsPerPage;
+    const count: number = pagination.itemsPerPage;
+
+    params.set('start', start.toString());
+    params.set('count', count.toString());
+
+    return params;
+  }
+
   private extractVideos(body: any) {
     const videos_json = body.data;
     const totalVideos = body.total;
@@ -65,15 +79,4 @@ export class VideoService {
     console.error(error);
     return Observable.throw(error.json().error || 'Server error');
   }
-
-  private createPaginationParams(pagination: Pagination) {
-    const params = new URLSearchParams();
-    const start: number = (pagination.currentPage - 1) * pagination.itemsPerPage;
-    const count: number = pagination.itemsPerPage;
-
-    params.set('start', start.toString());
-    params.set('count', count.toString());
-
-    return params;
-  }
 }
diff --git a/client/app/videos/video-add/video-add.component.ts b/client/app/videos/video-add/video-add.component.ts
index 67a04a2b4..b11475ae9 100644
--- a/client/app/videos/video-add/video-add.component.ts
+++ b/client/app/videos/video-add/video-add.component.ts
@@ -18,20 +18,21 @@ declare var jQuery: any;
 })
 
 export class VideoAddComponent implements OnInit {
-  user: User;
   fileToUpload: any;
   progressBar: { value: number; max: number; } = { value: 0, max: 0 };
+  user: User;
 
-  private _form: any;
+  private form: any;
 
   constructor(
-    private _router: Router, private _elementRef: ElementRef,
-    private _authService: AuthService
+    private router: Router,
+    private elementRef: ElementRef,
+    private authService: AuthService
   ) {}
 
   ngOnInit() {
     this.user = User.load();
-    jQuery(this._elementRef.nativeElement).find('#videofile').fileupload({
+    jQuery(this.elementRef.nativeElement).find('#videofile').fileupload({
       url: '/api/v1/videos',
       dataType: 'json',
       singleFileUploads: true,
@@ -39,7 +40,7 @@ export class VideoAddComponent implements OnInit {
       autoupload: false,
 
       add: (e, data) => {
-        this._form = data;
+        this.form = data;
         this.fileToUpload = data['files'][0];
       },
 
@@ -55,14 +56,14 @@ export class VideoAddComponent implements OnInit {
         console.log('Video uploaded.');
 
         // Print all the videos once it's finished
-        this._router.navigate(['VideosList']);
+        this.router.navigate(['VideosList']);
       }
     });
   }
 
   uploadFile() {
-    this._form.headers = this._authService.getRequestHeader().toJSON();
-    this._form.formData = jQuery(this._elementRef.nativeElement).find('form').serializeArray();
-    this._form.submit();
+    this.form.headers = this.authService.getRequestHeader().toJSON();
+    this.form.formData = jQuery(this.elementRef.nativeElement).find('form').serializeArray();
+    this.form.submit();
   }
 }
diff --git a/client/app/videos/video-list/video-list.component.ts b/client/app/videos/video-list/video-list.component.ts
index 3f54c98ce..23b97df32 100644
--- a/client/app/videos/video-list/video-list.component.ts
+++ b/client/app/videos/video-list/video-list.component.ts
@@ -23,23 +23,23 @@ import { VideoSortComponent } from './video-sort.component';
 })
 
 export class VideoListComponent implements OnInit {
-  user: User = null;
-  videos: Video[] = [];
+  loading = false;
   pagination: Pagination = {
     currentPage: 1,
     itemsPerPage: 9,
     total: 0
   };
   sort: SortField;
-  loading = false;
+  user: User = null;
+  videos: Video[] = [];
 
   private search: Search;
 
   constructor(
     private authService: AuthService,
-    private videoService: VideoService,
+    private router: Router,
     private routeParams: RouteParams,
-    private router: Router
+    private videoService: VideoService
   ) {
     this.search = {
       value: this.routeParams.get('search'),
@@ -73,6 +73,7 @@ export class VideoListComponent implements OnInit {
       ({ videos, totalVideos }) => {
         this.videos = videos;
         this.pagination.total = totalVideos;
+
         this.loading = false;
       },
       error => alert(error)
@@ -91,8 +92,8 @@ export class VideoListComponent implements OnInit {
     };
 
     if (this.search.value) {
-      params.search = this.search.value;
       params.field = this.search.field;
+      params.search = this.search.value;
     }
 
     this.router.navigate(['VideosList', params]);
diff --git a/client/app/videos/video-list/video-miniature.component.ts b/client/app/videos/video-list/video-miniature.component.ts
index 73416607a..3baa1ddd6 100644
--- a/client/app/videos/video-list/video-miniature.component.ts
+++ b/client/app/videos/video-list/video-miniature.component.ts
@@ -16,23 +16,23 @@ import { User } from '../../users/index';
 export class VideoMiniatureComponent {
   @Output() removed = new EventEmitter<any>();
 
-  @Input() video: Video;
   @Input() user: User;
+  @Input() video: Video;
 
   hovering = false;
 
   constructor(private videoService: VideoService) {}
 
-  onHover() {
-    this.hovering = true;
+  displayRemoveIcon() {
+    return this.hovering && this.video.isRemovableBy(this.user);
   }
 
   onBlur() {
     this.hovering = false;
   }
 
-  displayRemoveIcon() {
-    return this.hovering && this.video.isRemovableBy(this.user);
+  onHover() {
+    this.hovering = true;
   }
 
   removeVideo(id: string) {
diff --git a/client/app/videos/video-watch/video-watch.component.ts b/client/app/videos/video-watch/video-watch.component.ts
index c159b4004..137db8f0b 100644
--- a/client/app/videos/video-watch/video-watch.component.ts
+++ b/client/app/videos/video-watch/video-watch.component.ts
@@ -17,32 +17,24 @@ declare var WebTorrent: any;
 })
 
 export class VideoWatchComponent implements OnInit, CanDeactivate {
-  video: Video;
   downloadSpeed: number;
-  uploadSpeed: number;
-  numPeers: number;
   loading: boolean = false;
+  numPeers: number;
+  uploadSpeed: number;
+  video: Video;
 
-  private interval: NodeJS.Timer;
   private client: any;
+  private interval: NodeJS.Timer;
 
   constructor(
-    private videoService: VideoService,
+    private elementRef: ElementRef,
     private routeParams: RouteParams,
-    private elementRef: ElementRef
+    private videoService: VideoService
   ) {
     // TODO: use a service
     this.client = new WebTorrent({ dht: false });
   }
 
-  ngOnInit() {
-    let id = this.routeParams.get('id');
-    this.videoService.getVideo(id).subscribe(
-      video => this.loadVideo(video),
-      error => alert(error)
-    );
-  }
-
   loadVideo(video: Video) {
     this.loading = true;
     this.video = video;
@@ -60,12 +52,20 @@ export class VideoWatchComponent implements OnInit, CanDeactivate {
       // Refresh each second
       this.interval = setInterval(() => {
         this.downloadSpeed = torrent.downloadSpeed;
-        this.uploadSpeed = torrent.uploadSpeed;
         this.numPeers = torrent.numPeers;
+        this.uploadSpeed = torrent.uploadSpeed;
       }, 1000);
     });
   }
 
+  ngOnInit() {
+    let id = this.routeParams.get('id');
+    this.videoService.getVideo(id).subscribe(
+      video => this.loadVideo(video),
+      error => alert(error)
+    );
+  }
+
   routerCanDeactivate(next: ComponentInstruction, prev: ComponentInstruction) {
     console.log('Removing video from webtorrent.');
     clearInterval(this.interval);