Removed AngularJS and added features