Updated some layouts