Skip to content

More refactoring

More refactoring #1611