Fixed notebook controller user interaction FIXED BRANCH