Misc text layout updates