Updated the the layouts