Refactored layouts so only one is needed