Text component rebuild + minor fixes