Button task simplified, moved queue and subscribe logic in different file