Sync new modifications: Custom Widget and style fixes