#43 New feature layout base