Refactored fluid layout system, AGAIN:
merge conflicts