Did more work on the edit entry page as well as tried some stuff with the search on the main page
Merged changes successfully, mostly in editEntry with my new Notes entry