Some fixes, added Class diagram, some further functionality buttons are
temporary disabled now