Layout enhanced