Improve behaviour on jumping to a new page