Issue #131 - set layout to new name