New improved Layout (see #423)