Added working groups display and state handling