Fluid Layout Adjustments

**Ready to review and merge**

Fixes #1075