Fix display of legend in the new layout.
 Fixes issue #11