code style improvements and a little graph menu fix