Revert config
Update layouts