move some changes over, remove some unused layouts