Issue #128 - change layout