Acerto layout
Merge branch 'layout' into producao