Clean up if nesting.
Extract ship shield into widget.
Fix shield naming.