Build 2, includes html document display fix