modified some layouts for wTF