refactored layout names