Renamed EMptyWidget to PlainWidget
Small fixes to widgets