Improve content binding, binding on the right element and observing changes