Fixing service chooser transitions
Working on the system service.