Change menu definition + fix psr2 nomanclature