Layout e bug fix