Add menu, Change getContent to makeHTML, unAbstract Document and Entity