Updating to current layout
Update to current layout