adaptation to the new layout (fixes #5)