changed some layouts and resources