changed some layouts