Merge pull request #227 from mkurek/feature/services-gui

fixed admin
fixed flake