Added markup to Text
Minor tweeks