fixed some layouts