Minor fix on Layout