Moved output tool and fixed menu shortcuts