Split text layouting and text outlining into two separate steps

Split text layouting and text outlining into two separate steps #569