Now also keeps in mind the size of the settings controls itself.
Now also keeps in mind the size of the settings controls itself.

bertrand-caron/OFraMP,jimivdw/OFraMP,bertrand-caron/OFraMP,bertrand-caron/OFraMP,bertrand-caron/OFraMP,jimivdw/OFraMP