little refactoring in services and gui