Fixedd some layouts