Make less assumptions about surrounding div
Merge remote-tracking branch 'origin/master'
Avoid code duplication in js