renamed things and added other linearlayouts