Fix some GUI issue

Fix some GUI issue
Update CommonControls