Changed TextBlock to ContentPresenter in HeaderTemplate for Expander and GroupBox