Dvogonen/simplify companion preferences dialog 632

Ready for merge.
Some issues with profiles are outstanding.