[FIX] Gateway: UI changes