Changed some layouts