While this is probably out of scope for this review but I would think it highly relevant to refactor these blocks into Panels content types.

This would remove the dependency to the menu system and make them more broadly usable.