Switch to fluid layout

Signed-off-by: mereghost <marcello.rocha@gmail.com>