Moved tools to toolbar and menu