More felix control file support.
More layout control.