Hadi still upbeat on unity government