Add Req 4 Diagrams and fix menu bar search function