I've got the tool menu looking the way I want it to. Now to restructure handlers.