Fixed some layouts