bug fixes, widget layout improvement