prevent page transitions from jumping around
Merge branch 'develop'