Revert "Use fluid layout"

This reverts commit 4bbdcca3434180eed94f5297c203aadc534ea38a.