Merged event handlers and moved tools & handlers