Added class diagram, changed layout for diagram