Wip/tutorial refactoring phase 1

This is quick and dirty for now. Wait for layout refactoring