[FIX] Gateways: Form UI
Merge pull request #16 from vhpoet/develop

[FIX] Gateways: Form UI