Skip to content

Fixes #737

Fixes #737 #984