Handle expandable footer, restore Control widget mapping.
Merge pull request #8 from dtzinov/map-control-fix2

Handle expandable footer, restore Control widget mapping.