Fix text styling regression and prepare for graph transitions