start to working with 'layout' issues

Signed-off-by: Tiago Maluta <tiago.maluta@gmail.com>