Did some cleaning on the UML, made png UML more visible