Added a Widget

Fix some bugs