Tutorial layout fixes and Debugger fix for layers