Lots of edit page updates
more edit stuff
more work
Merge branch 'master' of https://github.com/timm-allman/Notes-Notes-Notes-
merge pbrought stuff
More merging