improved styling
implemented Feature: removing Gateways