Add Add_Notes Button
Fix merge conflicts.