#36, adjusted UML and added a default picture