Fixing some layouts