issue #2103 Add ControlButtonTest_Styling and modify some pkg