[FEATURE] GBI Gateway Discovery
[FIX] Fix trust.js
[FIX] Remove .row and br and fix merge conflicts