modified some layouts