[FIX] Gateway: UI changes

Use space