Various Bug Fixes & Add New Menu Type for Content Groups