Fix some critical bugs with view graph. Fix bug with func includes. Start create 4 stage