layout improved.
conflitos no merge resolvidos