Add header viewer/comments; removed RemoveHeader method