Issue136 trusted button

Applied patch from @strongX509 and fixed some style issues