Tools menu - simplify