Rebase layout from noosfero 0.42