Add responsive push and pull
Merge branch 'feature/push-pull'