Improve logging in and out + add context menu on services