Skip to content

More logic tweaks

More logic tweaks #307