Fix pluggin, add custom control