Fix layout for assignment