Revised some layouts