Adapt to recent leo html layout changes