Improved front part (working on AngularJS)