More flexible layout in Fannie. Expands more horizontally to
fit available space. Misc bugfixes.