Dvogonen/simplified companion menu 580

Fixes #580