GH33: Implement layouts

Please merge