Some warnings in layouts fixed