Merge pull request #470 from wpscanteam/layout-423

New improved Layout (see #423)