Add new class MapperControlButtonBox. Minor changes in other classes