fixed some layouts bugs