adapt layout for issue #42