Dvogonen/simplify companion preferences dialog 632

Moved things in FW download dialog after comment from Andre.
I think the result is a notable improvement.