More text positioning improvements