Fixed diagrams and formatting