Pulling main into my branch to update the UI

UI changes made and note dictionary updated