Diagrams and Menu fix back