Some minor widget tweaks.  Major changes to come.