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