Fix text in place

more changes.. please review