Revert "Revert "Use fluid layout""

This reverts commit 86fbb4c4ef99c83a714a1315264084d680358c79.
Use fluid layout with columnt