Improve source widget
Fix account widget buttons
Improve source widget and legend