More tweaks to update; Refactored notes listing to its own method