Add decrypt widgets, more fixes