Refactored layout requests