Fixed up more error in layout