Minor fix layout Surface properties