Enhancement 525 548 submenus charts

Kindly Review and Merge