Refactoring, fix for presenter notes, fix for inner nav timing