Append type after text and float text to the left.

Relates to #287, unfortunately there is no fix I can think of right now that won't have adverse effects. Might need to discuss it further.