Saving complaint and image merged into 1 request

Also some refactoring done
Some refactor in SaveComplaintTask