Revert "Trying fluid layout"

This reverts commit b2b75937d98dcbe76cb292d80f6e3bfd49f8d0ca.