Tweaked Controller Mapping window to keep button count. Related to issue #119. Fixed zone summary string generation.