Simplified structure
- Minor refactor
- AngularJS: push instead ajax query