Updated the layouts