URL template, scroll fix, next/prev fix
Merge remote-tracking branch 'origin/master'