Fixed some layouts;