Improve Note Navigation
Merge branch 'notes'
Fixing merge issues