Some refactoring, switches to using icons, adds tooltips