revised edit layout