Removed template overrides, major update on widget code