Behavior tweak

Behavior and skin tweak