Rebuild Widget Constructor
Formatting Fixes