updated to extend from internal Menu block bundle
merged changes