tweak button form types
enhance bundle configuration
control controller improvments