Moved earlier edit too main-layout