Fix for moderation dialogs not appearing when comment detail opened from notification, also made various changes recommended by code inspection