[Fix] Beauty corrections in layout