Revert "new fluid grid layout"

This reverts commit 1b6e76395c683f53dbb252d638fbad27b732280d.