jcheng26 lcheng59: Fixed bug where layouts were overlapping.