refactored layut names