Minor UI card fragment cleanup
More UI header UI clean