improved some layouts