Adjustments layout

Signed-off-by: Renato Carvalho <renatolz@gmail.com>