Fluid Layout Adjustments

Fixes #1075