General cleanup.  Fix null exceptions and missing trigger in UI elements.