AngularJs integration
Url regex fix
Redirect fix and js refactor