Add loading graphic and clean up connection msg template