Refactored the client-requirement and team-requirement buttons