Fix tool tips and edit modal

@asmockler Took a look at edit and tooltips for you, didn't get around to the delete modal.