Fixed some problems and improved design on extension widgets.