Simplify tools

* Simplified the tool scheme and improved highlighting, I think
* Set tool back to marker after a note is deleted