Commit before changing fundamental layout...