RD-1996 Re-ordered AngularJS components