Tutorial layout and plugin refactoring