Commit #3

Improved widgets