Keep template positions by default
Better menu migration and restore
Small issue on step class
Small issues on checks