Widgets

* Improved properties names